Skip to content

Commit dff9190

Browse files
harperchenmchehab
authored andcommitted
media: dvb-usb-v2: ce6230: fix null-ptr-deref in ce6230_i2c_master_xfer()
In ce6230_i2c_master_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 ce6230_i2c_master_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 0ed554f ("media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()") Link: https://lore.kernel.org/linux-media/20230313092751.209496-1-harperchen1110@gmail.com Signed-off-by: Wei Chen <harperchen1110@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
1 parent a6dcefc commit dff9190

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ static int ce6230_i2c_master_xfer(struct i2c_adapter *adap,
101101
if (num > i + 1 && (msg[i+1].flags & I2C_M_RD)) {
102102
if (msg[i].addr ==
103103
ce6230_zl10353_config.demod_address) {
104+
if (msg[i].len < 1) {
105+
i = -EOPNOTSUPP;
106+
break;
107+
}
104108
req.cmd = DEMOD_READ;
105109
req.value = msg[i].addr >> 1;
106110
req.index = msg[i].buf[0];
@@ -117,6 +121,10 @@ static int ce6230_i2c_master_xfer(struct i2c_adapter *adap,
117121
} else {
118122
if (msg[i].addr ==
119123
ce6230_zl10353_config.demod_address) {
124+
if (msg[i].len < 1) {
125+
i = -EOPNOTSUPP;
126+
break;
127+
}
120128
req.cmd = DEMOD_WRITE;
121129
req.value = msg[i].addr >> 1;
122130
req.index = msg[i].buf[0];

0 commit comments

Comments
 (0)