From: Sasha Levin Date: Mon, 7 Nov 2022 04:04:25 +0000 (-0500) Subject: Fixes for 4.14 X-Git-Tag: v4.9.333~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0dc272a7632903bca03980ed0f9d20e8a68ee78;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/i2c-xiic-add-platform-module-alias.patch b/queue-4.14/i2c-xiic-add-platform-module-alias.patch new file mode 100644 index 00000000000..682066045c1 --- /dev/null +++ b/queue-4.14/i2c-xiic-add-platform-module-alias.patch @@ -0,0 +1,38 @@ +From e7996243d063272e5b75a6285b40604d80c1a996 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 Oct 2022 16:03:37 +0200 +Subject: i2c: xiic: Add platform module alias +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Martin Tůma + +[ Upstream commit b8caf0a0e04583fb71e21495bef84509182227ea ] + +The missing "platform" alias is required for the mgb4 v4l2 driver to load +the i2c controller driver when probing the HW. + +Signed-off-by: Martin Tůma +Acked-by: Michal Simek +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-xiic.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c +index da526cc471cc..1f512f0d31a5 100644 +--- a/drivers/i2c/busses/i2c-xiic.c ++++ b/drivers/i2c/busses/i2c-xiic.c +@@ -900,6 +900,7 @@ static struct platform_driver xiic_i2c_driver = { + + module_platform_driver(xiic_i2c_driver); + ++MODULE_ALIAS("platform:" DRIVER_NAME); + MODULE_AUTHOR("info@mocean-labs.com"); + MODULE_DESCRIPTION("Xilinx I2C bus driver"); + MODULE_LICENSE("GPL v2"); +-- +2.35.1 + diff --git a/queue-4.14/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch b/queue-4.14/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch new file mode 100644 index 00000000000..98f5350d7fd --- /dev/null +++ b/queue-4.14/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch @@ -0,0 +1,35 @@ +From ea45a7d2bef8e255762a0bcaba8b6bfc0a4bd328 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Aug 2022 12:35:43 +0200 +Subject: media: atomisp: Fix v4l2_fh resource leak on open errors + +From: Hans de Goede + +[ Upstream commit 5b9853ad1329be49343a608d574eb232ff1273d0 ] + +When atomisp_open() fails then it must call v4l2_fh_release() to undo +the results of v4l2_fh_open(). + +Reviewed-by: Andy Shevchenko +Signed-off-by: Hans de Goede +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c +index f1d8cc5a2730..0645751b4b19 100644 +--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c ++++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c +@@ -888,6 +888,7 @@ static int atomisp_open(struct file *file) + hmm_pool_unregister(HMM_POOL_TYPE_DYNAMIC); + pm_runtime_put(vdev->v4l2_dev->dev); + rt_mutex_unlock(&isp->mutex); ++ v4l2_fh_release(file); + return ret; + } + +-- +2.35.1 + diff --git a/queue-4.14/media-dvb-frontends-drxk-initialize-err-to-0.patch b/queue-4.14/media-dvb-frontends-drxk-initialize-err-to-0.patch new file mode 100644 index 00000000000..10007e77d51 --- /dev/null +++ b/queue-4.14/media-dvb-frontends-drxk-initialize-err-to-0.patch @@ -0,0 +1,42 @@ +From 7faad60a0978848d66a8f7c459adaaba39f9a421 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Aug 2022 07:59:24 +0200 +Subject: media: dvb-frontends/drxk: initialize err to 0 + +From: Hans Verkuil + +[ Upstream commit 20694e96ca089ce6693c2348f8f628ee621e4e74 ] + +Fix a compiler warning: + +drivers/media/dvb-frontends/drxk_hard.c: In function 'drxk_read_ucblocks': +drivers/media/dvb-frontends/drxk_hard.c:6673:21: warning: 'err' may be used uninitialized [-Wmaybe-uninitialized] + 6673 | *ucblocks = (u32) err; + | ^~~~~~~~~ +drivers/media/dvb-frontends/drxk_hard.c:6663:13: note: 'err' was declared here + 6663 | u16 err; + | ^~~ + +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c +index 48a8aad47a74..98146e74bbdf 100644 +--- a/drivers/media/dvb-frontends/drxk_hard.c ++++ b/drivers/media/dvb-frontends/drxk_hard.c +@@ -6700,7 +6700,7 @@ static int drxk_read_snr(struct dvb_frontend *fe, u16 *snr) + static int drxk_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) + { + struct drxk_state *state = fe->demodulator_priv; +- u16 err; ++ u16 err = 0; + + dprintk(1, "\n"); + +-- +2.35.1 + diff --git a/queue-4.14/media-s5p_cec-limit-msg.len-to-cec_max_msg_size.patch b/queue-4.14/media-s5p_cec-limit-msg.len-to-cec_max_msg_size.patch new file mode 100644 index 00000000000..1782b7908fd --- /dev/null +++ b/queue-4.14/media-s5p_cec-limit-msg.len-to-cec_max_msg_size.patch @@ -0,0 +1,35 @@ +From a9a2b3a8046ee681bf0994c93cbef9b2012c1496 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 Aug 2022 09:02:42 +0200 +Subject: media: s5p_cec: limit msg.len to CEC_MAX_MSG_SIZE + +From: Hans Verkuil + +[ Upstream commit 93f65ce036863893c164ca410938e0968964b26c ] + +I expect that the hardware will have limited this to 16, but just in +case it hasn't, check for this corner case. + +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/s5p-cec/s5p_cec.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/media/platform/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c +index 3032247c63a5..554c8f2b60b8 100644 +--- a/drivers/media/platform/s5p-cec/s5p_cec.c ++++ b/drivers/media/platform/s5p-cec/s5p_cec.c +@@ -116,6 +116,8 @@ static irqreturn_t s5p_cec_irq_handler(int irq, void *priv) + dev_dbg(cec->dev, "Buffer overrun (worker did not process previous message)\n"); + cec->rx = STATE_BUSY; + cec->msg.len = status >> 24; ++ if (cec->msg.len > CEC_MAX_MSG_SIZE) ++ cec->msg.len = CEC_MAX_MSG_SIZE; + cec->msg.rx_status = CEC_RX_STATUS_OK; + s5p_cec_get_rx_buf(cec, cec->msg.len, + cec->msg.msg); +-- +2.35.1 + diff --git a/queue-4.14/series b/queue-4.14/series index e298cb9b875..98004095000 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -17,3 +17,7 @@ bluetooth-l2cap-fix-use-after-free-caused-by-l2cap_r.patch bluetooth-l2cap-fix-use-after-free-in-l2cap_conn_del.patch net-mdio-fix-undefined-behavior-in-bit-shift-for-__m.patch net-neigh-fix-null-ptr-deref-in-neigh_table_clear.patch +media-s5p_cec-limit-msg.len-to-cec_max_msg_size.patch +media-dvb-frontends-drxk-initialize-err-to-0.patch +media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch +i2c-xiic-add-platform-module-alias.patch