Commit be6a5684 authored by Zhang Shurong's avatar Zhang Shurong Committed by sanglipeng
Browse files

media: az6007: Fix null-ptr-deref in az6007_i2c_xfer() 

stable inclusion
from stable-v5.10.197
commit a9def3e9718a4dc756f48db147d42ec41a966240
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I96Q8P

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a9def3e9718a4dc756f48db147d42ec41a966240



--------------------------------

[ Upstream commit 1047f934 ]

In az6007_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 az6007_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 0ed554fd
("media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()")

Signed-off-by: default avatarZhang Shurong <zhang_shurong@foxmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent f692580c

drivers/media/usb/dvb-usb-v2/az6007.c

+8 −0
Original line number Diff line number Diff line
@@ -788,6 +788,10 @@ static int az6007_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], 
			if (az6007_xfer_debug)

				printk(KERN_DEBUG "az6007: I2C W addr=0x%x len=%d\n",

				       addr, msgs[i].len);

			if (msgs[i].len < 1) {

				ret = -EIO;

				goto err;

			}

			req = AZ6007_I2C_WR;

			index = msgs[i].buf[0];

			value = addr | (1 << 8);
@@ -802,6 +806,10 @@ static int az6007_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], 
			if (az6007_xfer_debug)

				printk(KERN_DEBUG "az6007: I2C R addr=0x%x len=%d\n",

				       addr, msgs[i].len);

			if (msgs[i].len < 1) {

				ret = -EIO;

				goto err;

			}

			req = AZ6007_I2C_RD;

			index = msgs[i].buf[0];

			value = addr;