Commit f81ee4d5 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

USB: iowarrior.c: fix NULL dereference

Am Montag, 19. 2007 10:25 schrieb Adrian Bunk:
> The Coverity checker spotted the following NULL dereference:

And this fixes an oops upon allocation failures.
Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 686149f4
...@@ -417,14 +417,14 @@ static ssize_t iowarrior_write(struct file *file, ...@@ -417,14 +417,14 @@ static ssize_t iowarrior_write(struct file *file,
if (!int_out_urb) { if (!int_out_urb) {
retval = -ENOMEM; retval = -ENOMEM;
dbg("%s Unable to allocate urb ", __func__); dbg("%s Unable to allocate urb ", __func__);
goto error; goto error_no_urb;
} }
buf = usb_buffer_alloc(dev->udev, dev->report_size, buf = usb_buffer_alloc(dev->udev, dev->report_size,
GFP_KERNEL, &int_out_urb->transfer_dma); GFP_KERNEL, &int_out_urb->transfer_dma);
if (!buf) { if (!buf) {
retval = -ENOMEM; retval = -ENOMEM;
dbg("%s Unable to allocate buffer ", __func__); dbg("%s Unable to allocate buffer ", __func__);
goto error; goto error_no_buffer;
} }
usb_fill_int_urb(int_out_urb, dev->udev, usb_fill_int_urb(int_out_urb, dev->udev,
usb_sndintpipe(dev->udev, usb_sndintpipe(dev->udev,
...@@ -459,7 +459,9 @@ static ssize_t iowarrior_write(struct file *file, ...@@ -459,7 +459,9 @@ static ssize_t iowarrior_write(struct file *file,
error: error:
usb_buffer_free(dev->udev, dev->report_size, buf, usb_buffer_free(dev->udev, dev->report_size, buf,
int_out_urb->transfer_dma); int_out_urb->transfer_dma);
error_no_buffer:
usb_free_urb(int_out_urb); usb_free_urb(int_out_urb);
error_no_urb:
atomic_dec(&dev->write_busy); atomic_dec(&dev->write_busy);
wake_up_interruptible(&dev->write_wait); wake_up_interruptible(&dev->write_wait);
exit: exit:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment