diff options
| author | Zhang Shurong <zhang_shurong@foxmail.com> | 2023-07-08 23:24:11 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-09-23 11:01:07 +0200 |
| commit | c7e5ac737db25d7387fe517cb5207706782b6cf8 (patch) | |
| tree | 8e586f89a59f479c2cc01f15f171eaee8acf1325 | |
| parent | 97fdbdb750342cbc204befde976872fedb406ee6 (diff) | |
| download | linux-c7e5ac737db25d7387fe517cb5207706782b6cf8.tar.gz linux-c7e5ac737db25d7387fe517cb5207706782b6cf8.tar.bz2 linux-c7e5ac737db25d7387fe517cb5207706782b6cf8.zip | |
media: af9005: Fix null-ptr-deref in af9005_i2c_xfer
[ Upstream commit f4ee84f27625ce1fdf41e8483fa0561a1b837d10 ]
In af9005_i2c_xfer, 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 af9005_i2c_xfer. 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 0ed554fd769a
("media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()")
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>
| -rw-r--r-- | drivers/media/usb/dvb-usb/af9005.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/usb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c index b6a2436d16e9..9af54fcbed1d 100644 --- a/drivers/media/usb/dvb-usb/af9005.c +++ b/drivers/media/usb/dvb-usb/af9005.c @@ -422,6 +422,10 @@ static int af9005_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], if (ret == 0) ret = 2; } else { + if (msg[0].len < 2) { + ret = -EOPNOTSUPP; + goto unlock; + } /* write one or more registers */ reg = msg[0].buf[0]; addr = msg[0].addr; @@ -431,6 +435,7 @@ static int af9005_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], ret = 1; } +unlock: mutex_unlock(&d->i2c_mutex); return ret; } |