From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Zhang Shurong <zhang_shurong@foxmail.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Sasha Levin <sashal@kernel.org>,
mchehab@kernel.org, yuzhe@nfschina.com, harperchen1110@gmail.com,
linux-media@vger.kernel.org
Subject: [PATCH AUTOSEL 6.5 03/28] media: dw2102: Fix null-ptr-deref in dw2102_i2c_transfer()
Date: Fri, 8 Sep 2023 20:35:37 -0400 [thread overview]
Message-ID: <20230909003604.3579407-3-sashal@kernel.org> (raw)
In-Reply-To: <20230909003604.3579407-1-sashal@kernel.org>
From: Zhang Shurong <zhang_shurong@foxmail.com>
[ Upstream commit 5ae544d94abc8ff77b1b9bf8774def3fa5689b5b ]
In dw2102_i2c_transfer, msg is controlled by user. When msg[i].buf
is null and msg[i].len is zero, former checks on msg[i].buf would be
passed. Malicious data finally reach dw2102_i2c_transfer. If accessing
msg[i].buf[0] without sanity check, null ptr deref would happen.
We add check on msg[i].len to prevent crash.
Similar commit:
commit 950e252cb469
("[media] dw2102: limit messages to buffer size")
Signed-off-by: Zhang Shurong <zhang_shurong@foxmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/media/usb/dvb-usb/dw2102.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 970b84c3f0b5a..b3bb1805829ad 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -128,6 +128,10 @@ static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
switch (num) {
case 2:
+ if (msg[0].len < 1) {
+ num = -EOPNOTSUPP;
+ break;
+ }
/* read stv0299 register */
value = msg[0].buf[0];/* register */
for (i = 0; i < msg[1].len; i++) {
@@ -139,6 +143,10 @@ static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
case 1:
switch (msg[0].addr) {
case 0x68:
+ if (msg[0].len < 2) {
+ num = -EOPNOTSUPP;
+ break;
+ }
/* write to stv0299 register */
buf6[0] = 0x2a;
buf6[1] = msg[0].buf[0];
@@ -148,6 +156,10 @@ static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
break;
case 0x60:
if (msg[0].flags == 0) {
+ if (msg[0].len < 4) {
+ num = -EOPNOTSUPP;
+ break;
+ }
/* write to tuner pll */
buf6[0] = 0x2c;
buf6[1] = 5;
@@ -159,6 +171,10 @@ static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
dw210x_op_rw(d->udev, 0xb2, 0, 0,
buf6, 7, DW210X_WRITE_MSG);
} else {
+ if (msg[0].len < 1) {
+ num = -EOPNOTSUPP;
+ break;
+ }
/* read from tuner */
dw210x_op_rw(d->udev, 0xb5, 0, 0,
buf6, 1, DW210X_READ_MSG);
@@ -166,12 +182,20 @@ static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
}
break;
case (DW2102_RC_QUERY):
+ if (msg[0].len < 2) {
+ num = -EOPNOTSUPP;
+ break;
+ }
dw210x_op_rw(d->udev, 0xb8, 0, 0,
buf6, 2, DW210X_READ_MSG);
msg[0].buf[0] = buf6[0];
msg[0].buf[1] = buf6[1];
break;
case (DW2102_VOLTAGE_CTRL):
+ if (msg[0].len < 1) {
+ num = -EOPNOTSUPP;
+ break;
+ }
buf6[0] = 0x30;
buf6[1] = msg[0].buf[0];
dw210x_op_rw(d->udev, 0xb2, 0, 0,
--
2.40.1
next prev parent reply other threads:[~2023-09-09 0:37 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-09 0:35 [PATCH AUTOSEL 6.5 01/28] media: mdp3: Fix resource leaks in of_find_device_by_node Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 02/28] media: dvb-usb-v2: af9035: Fix null-ptr-deref in af9035_i2c_master_xfer Sasha Levin
2023-09-09 0:35 ` Sasha Levin [this message]
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 04/28] media: af9005: Fix null-ptr-deref in af9005_i2c_xfer Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 05/28] media: anysee: fix null-ptr-deref in anysee_master_xfer Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 06/28] media: az6007: Fix null-ptr-deref in az6007_i2c_xfer() Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 07/28] media: dvb-usb-v2: gl861: Fix null-ptr-deref in gl861_i2c_master_xfer Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 08/28] iio: core: Use min() instead of min_t() to make code more robust Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 09/28] scsi: lpfc: Abort outstanding ELS cmds when mailbox timeout error is detected Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 10/28] media: tuners: qt1010: replace BUG_ON with a regular error Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 11/28] media: pci: cx23885: replace BUG with error return Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 12/28] usb: cdns3: Put the cdns set active part outside the spin lock Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 13/28] usb: typec: intel_pmc_mux: Add new ACPI ID for Lunar Lake IOM device Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 14/28] usb: gadget: fsl_qe_udc: validate endpoint index for ch9 udc Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 15/28] tools: iio: iio_generic_buffer: Fix some integer type and calculation Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 16/28] scsi: target: iscsi: Fix buffer overflow in lio_target_nacl_info_show() Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 17/28] serial: cpm_uart: Avoid suspicious locking Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 18/28] misc: open-dice: make OPEN_DICE depend on HAS_IOMEM Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 19/28] workqueue: Call wq_update_unbound_numa() on all CPUs in NUMA node on CPU hotplug Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 20/28] usb: dwc3: dwc3-octeon: Verify clock divider Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 21/28] usb: ehci: add workaround for chipidea PORTSC.PEC bug Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 22/28] usb: chipidea: add workaround for chipidea PEC bug Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 23/28] media: pci: ipu3-cio2: Initialise timing struct to avoid a compiler warning Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 24/28] kobject: Add sanity check for kset->kobj.ktype in kset_register() Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 25/28] interconnect: Fix locking for runpm vs reclaim Sasha Levin
2023-09-09 0:36 ` [PATCH AUTOSEL 6.5 26/28] usb: cdc-acm: move ldisc dcd notification outside of acm's read lock Sasha Levin
2023-09-09 0:36 ` [PATCH AUTOSEL 6.5 27/28] usb: typec: qcom-pmic-typec: register drm_bridge Sasha Levin
2023-09-09 0:36 ` [PATCH AUTOSEL 6.5 28/28] riscv: Add CFI error handling Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230909003604.3579407-3-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=harperchen1110@gmail.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=stable@vger.kernel.org \
--cc=yuzhe@nfschina.com \
--cc=zhang_shurong@foxmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox