openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] dvb-usb-firmware: don't do DMA on stack 

The buffer allocation for the firmware data was changed in
commit 43fab9793c ("[media] dvb-usb: don't use stack for firmware load")
but the same applies for the reset value.

Fixes: 43fab9793c ("[media] dvb-usb: don't use stack for firmware load")
Cc: stable@vger.kernel.org
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Stefan Brüns 2017-02-12 13:02:13 -02:00 committed by Mauro Carvalho Chehab
parent 8c71fff434
commit 67b0503db9
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/usb/dvb-usb/dvb-usb-firmware.c
View File

@ -36,16 +36,18 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type) int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
{ {
struct hexline *hx; struct hexline *hx;
u8 reset; u8 *buf;
int ret,pos=0; int ret, pos = 0;
u16 cpu_cs_register = cypress[type].cpu_cs_register;
hx = kmalloc(sizeof(*hx), GFP_KERNEL); buf = kmalloc(sizeof(*hx), GFP_KERNEL);
if (!hx) if (!buf)
return -ENOMEM; return -ENOMEM;
hx = (struct hexline *)buf;
/* stop the CPU */ /* stop the CPU */
reset = 1; buf[0] = 1;
if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1) if (usb_cypress_writemem(udev, cpu_cs_register, buf, 1) != 1)
err("could not stop the USB controller CPU."); err("could not stop the USB controller CPU.");
while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) { while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) {
@ -61,21 +63,21 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw
} }
if (ret < 0) { if (ret < 0) {
err("firmware download failed at %d with %d",pos,ret); err("firmware download failed at %d with %d",pos,ret);
kfree(hx); kfree(buf);
return ret; return ret;
} }
if (ret == 0) { if (ret == 0) {
/* restart the CPU */ /* restart the CPU */
reset = 0; buf[0] = 0;
if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) { if (usb_cypress_writemem(udev, cpu_cs_register, buf, 1) != 1) {
err("could not restart the USB controller CPU."); err("could not restart the USB controller CPU.");
ret = -EINVAL; ret = -EINVAL;
} }
} else } else
ret = -EIO; ret = -EIO;
kfree(hx); kfree(buf);
return ret; return ret;
} }