]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jul 2024 13:18:25 +0000 (15:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jul 2024 13:18:25 +0000 (15:18 +0200)
added patches:
media-dw2102-fix-a-potential-buffer-overflow.patch

queue-4.19/media-dw2102-fix-a-potential-buffer-overflow.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/media-dw2102-fix-a-potential-buffer-overflow.patch b/queue-4.19/media-dw2102-fix-a-potential-buffer-overflow.patch
new file mode 100644 (file)
index 0000000..8973569
--- /dev/null
@@ -0,0 +1,35 @@
+From 1c73d0b29d04bf4082e7beb6a508895e118ee30d Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@kernel.org>
+Date: Mon, 29 Apr 2024 15:15:05 +0100
+Subject: media: dw2102: fix a potential buffer overflow
+
+From: Mauro Carvalho Chehab <mchehab@kernel.org>
+
+commit 1c73d0b29d04bf4082e7beb6a508895e118ee30d upstream.
+
+As pointed by smatch:
+        drivers/media/usb/dvb-usb/dw2102.c:802 su3000_i2c_transfer() error: __builtin_memcpy() '&state->data[4]' too small (64 vs 67)
+
+That seemss to be due to a wrong copy-and-paste.
+
+Fixes: 0e148a522b84 ("media: dw2102: Don't translate i2c read into write")
+
+Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
+Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/usb/dvb-usb/dw2102.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/usb/dvb-usb/dw2102.c
++++ b/drivers/media/usb/dvb-usb/dw2102.c
+@@ -789,7 +789,7 @@ static int su3000_i2c_transfer(struct i2
+                       if (msg[j].flags & I2C_M_RD) {
+                               /* single read */
+-                              if (1 + msg[j].len > sizeof(state->data)) {
++                              if (4 + msg[j].len > sizeof(state->data)) {
+                                       warn("i2c rd: len=%d is too big!\n", msg[j].len);
+                                       num = -EOPNOTSUPP;
+                                       break;
index 922d1792753c63f7d0e399938a2c813684d60200..9ad25d461263f34d62b7d810a361d20122dd38a4 100644 (file)
@@ -38,3 +38,4 @@ revert-mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch
 drm-nouveau-fix-null-pointer-dereference-in-nouveau_connector_get_modes.patch
 drm-amdgpu-atomfirmware-silence-ubsan-warning.patch
 bnx2x-fix-multiple-ubsan-array-index-out-of-bounds.patch
+media-dw2102-fix-a-potential-buffer-overflow.patch