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

carl9170: fix async command buffer leak 

If __carl9170_exec_cmd fails to upload an asynchronous
command to the device, the functions: carl9170_reboot
and carl9170_powersave will leak the temporary command
assembly buffer.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Christian Lamparter 2010-10-16 01:38:46 +02:00 committed by John W. Linville
parent 9192f715bc
commit cae7f953e8
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/wireless/ath/carl9170/usb.c
View File

@ -591,16 +591,23 @@ int __carl9170_exec_cmd(struct ar9170 *ar, struct carl9170_cmd *cmd,
const bool free_buf) const bool free_buf)
{ {
struct urb *urb; struct urb *urb;
int err = 0;
if (!IS_INITIALIZED(ar)) if (!IS_INITIALIZED(ar)) {
return -EPERM; err = -EPERM;
goto err_free;
}
if (WARN_ON(cmd->hdr.len > CARL9170_MAX_CMD_LEN - 4)) if (WARN_ON(cmd->hdr.len > CARL9170_MAX_CMD_LEN - 4)) {
return -EINVAL; err = -EINVAL;
goto err_free;
}
urb = usb_alloc_urb(0, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) if (!urb) {
return -ENOMEM; err = -ENOMEM;
goto err_free;
}
usb_fill_int_urb(urb, ar->udev, usb_sndintpipe(ar->udev, usb_fill_int_urb(urb, ar->udev, usb_sndintpipe(ar->udev,
AR9170_USB_EP_CMD), cmd, cmd->hdr.len + 4, AR9170_USB_EP_CMD), cmd, cmd->hdr.len + 4,
@ -613,6 +620,12 @@ int __carl9170_exec_cmd(struct ar9170 *ar, struct carl9170_cmd *cmd,
usb_free_urb(urb); usb_free_urb(urb);
return carl9170_usb_submit_cmd_urb(ar); return carl9170_usb_submit_cmd_urb(ar);
err_free:
if (free_buf)
kfree(cmd);
return err;
} }
int carl9170_exec_cmd(struct ar9170 *ar, const enum carl9170_cmd_oids cmd, int carl9170_exec_cmd(struct ar9170 *ar, const enum carl9170_cmd_oids cmd,