korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 09:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: m920x: don't use stack on USB reads

Browse Source 
[ Upstream commit a2ab06d7c4 ]

Using stack-allocated pointers for USB message data don't work.
This driver is almost OK with that, except for the I2C read
logic.

Fix it by using a temporary read buffer, just like on all other
calls to m920x_read().

Link: https://lore.kernel.org/all/ccc99e48-de4f-045e-0fe4-61e3118e3f74@mida.se/
Reported-by: rkardell@mida.se
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2021-12-06 15:34:19 +01:00 committed by Greg Kroah-Hartman
parent 6aaff2d7c9
commit 0c044e39d5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/usb/dvb-usb/m920x.c
View File

@ -274,6 +274,13 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nu
/* Should check for ack here, if we knew how. */ /* Should check for ack here, if we knew how. */
} }
if (msg[i].flags & I2C_M_RD) { if (msg[i].flags & I2C_M_RD) {
char *read = kmalloc(1, GFP_KERNEL);
if (!read) {
ret = -ENOMEM;
kfree(read);
goto unlock;
}
for (j = 0; j < msg[i].len; j++) { for (j = 0; j < msg[i].len; j++) {
/* Last byte of transaction? /* Last byte of transaction?
* Send STOP, otherwise send ACK. */ * Send STOP, otherwise send ACK. */
@ -281,9 +288,12 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nu
if ((ret = m920x_read(d->udev, M9206_I2C, 0x0, if ((ret = m920x_read(d->udev, M9206_I2C, 0x0,
0x20 | stop, 0x20 | stop,
&msg[i].buf[j], 1)) != 0) read, 1)) != 0)
goto unlock; goto unlock;
msg[i].buf[j] = read[0];
} }
kfree(read);
} else { } else {
for (j = 0; j < msg[i].len; j++) { for (j = 0; j < msg[i].len; j++) {
/* Last byte of transaction? Then send STOP. */ /* Last byte of transaction? Then send STOP. */