Skip to content

Commit

Permalink
net: wireless: orinoco: orinoco_usb.c: fix DMA buffers on stack
Browse files Browse the repository at this point in the history
This patch fixes an instance of DMA buffer on stack(being passed to
usb_control_msg) for the wireless USB version of the Agere Orinoco card driver.
It also fixes the missing audit for the return value of firmware download
routine. Found using smatch.

Signed-off-by: Kumar Amit Mehta <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
  • Loading branch information
KumarAmitMehta authored and linvjw committed Feb 18, 2013
1 parent bc6b892 commit 488ec87
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/net/wireless/orinoco/orinoco_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -804,10 +804,15 @@ static inline int ezusb_8051_cpucs(struct ezusb_priv *upriv, int reset)
static int ezusb_firmware_download(struct ezusb_priv *upriv,
struct ez_usb_fw *fw)
{
u8 fw_buffer[FW_BUF_SIZE];
u8 *fw_buffer;
int retval, addr;
int variant_offset;

fw_buffer = kmalloc(FW_BUF_SIZE, GFP_KERNEL);
if (!fw_buffer) {
printk(KERN_ERR PFX "Out of memory for firmware buffer.\n");
return -ENOMEM;
}
/*
* This byte is 1 and should be replaced with 0. The offset is
* 0x10AD in version 0.0.6. The byte in question should follow
Expand Down Expand Up @@ -859,6 +864,7 @@ static int ezusb_firmware_download(struct ezusb_priv *upriv,
printk(KERN_ERR PFX "Firmware download failed, error %d\n",
retval);
exit:
kfree(fw_buffer);
return retval;
}

Expand Down Expand Up @@ -1681,7 +1687,8 @@ static int ezusb_probe(struct usb_interface *interface,
firmware.code = fw_entry->data;
}
if (firmware.size && firmware.code) {
ezusb_firmware_download(upriv, &firmware);
if (ezusb_firmware_download(upriv, &firmware))
goto error;
} else {
err("No firmware to download");
goto error;
Expand Down

0 comments on commit 488ec87

Please sign in to comment.