Skip to content

Commit 6be431f

Browse files
StefanBruensgregkh
authored andcommitted
dvb-usb-firmware: don't do DMA on stack
commit 67b0503db9c29b04eadfeede6bebbfe5ddad94ef upstream. The buffer allocation for the firmware data was changed in commit 43fab9793c1f ("[media] dvb-usb: don't use stack for firmware load") but the same applies for the reset value. Fixes: 43fab9793c1f ("[media] dvb-usb: don't use stack for firmware load") Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Cc: Ben Hutchings <ben@decadent.org.uk> Cc: Brad Spengler <spender@grsecurity.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5021574 commit 6be431f

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

drivers/media/usb/dvb-usb/dvb-usb-firmware.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,18 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
3636
int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
3737
{
3838
struct hexline *hx;
39-
u8 reset;
40-
int ret,pos=0;
39+
u8 *buf;
40+
int ret, pos = 0;
41+
u16 cpu_cs_register = cypress[type].cpu_cs_register;
4142

42-
hx = kmalloc(sizeof(*hx), GFP_KERNEL);
43-
if (!hx)
43+
buf = kmalloc(sizeof(*hx), GFP_KERNEL);
44+
if (!buf)
4445
return -ENOMEM;
46+
hx = (struct hexline *)buf;
4547

4648
/* stop the CPU */
47-
reset = 1;
48-
if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
49+
buf[0] = 1;
50+
if (usb_cypress_writemem(udev, cpu_cs_register, buf, 1) != 1)
4951
err("could not stop the USB controller CPU.");
5052

5153
while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) {
@@ -62,21 +64,21 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw
6264
}
6365
if (ret < 0) {
6466
err("firmware download failed at %d with %d",pos,ret);
65-
kfree(hx);
67+
kfree(buf);
6668
return ret;
6769
}
6870

6971
if (ret == 0) {
7072
/* restart the CPU */
71-
reset = 0;
72-
if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
73+
buf[0] = 0;
74+
if (usb_cypress_writemem(udev, cpu_cs_register, buf, 1) != 1) {
7375
err("could not restart the USB controller CPU.");
7476
ret = -EINVAL;
7577
}
7678
} else
7779
ret = -EIO;
7880

79-
kfree(hx);
81+
kfree(buf);
8082

8183
return ret;
8284
}

0 commit comments

Comments
 (0)