The patch titled
drivers/usb/misc/iowarrior.c: NULL dereference
has been removed from the -mm tree. Its filename was
drivers-usb-misc-iowarriorc-null-dereference.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: drivers/usb/misc/iowarrior.c: NULL dereference
From: Oliver Neukum <oneukum@xxxxxxx>
Fix an oops upon allocation failures.
Signed-off-by: Oliver Neukum <oneukum@xxxxxxx>
Cc: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/usb/misc/iowarrior.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/usb/misc/iowarrior.c~drivers-usb-misc-iowarriorc-null-dereference drivers/usb/misc/iowarrior.c
--- a/drivers/usb/misc/iowarrior.c~drivers-usb-misc-iowarriorc-null-dereference
+++ a/drivers/usb/misc/iowarrior.c
@@ -417,14 +417,14 @@ static ssize_t iowarrior_write(struct fi
if (!int_out_urb) {
retval = -ENOMEM;
dbg("%s Unable to allocate urb ", __func__);
- goto error;
+ goto error_no_urb;
}
buf = usb_buffer_alloc(dev->udev, dev->report_size,
GFP_KERNEL, &int_out_urb->transfer_dma);
if (!buf) {
retval = -ENOMEM;
dbg("%s Unable to allocate buffer ", __func__);
- goto error;
+ goto error_no_buffer;
}
usb_fill_int_urb(int_out_urb, dev->udev,
usb_sndintpipe(dev->udev,
@@ -459,7 +459,9 @@ static ssize_t iowarrior_write(struct fi
error:
usb_buffer_free(dev->udev, dev->report_size, buf,
int_out_urb->transfer_dma);
+error_no_buffer:
usb_free_urb(int_out_urb);
+error_no_urb:
atomic_dec(&dev->write_busy);
wake_up_interruptible(&dev->write_wait);
exit:
_
Patches currently in -mm which might be from oneukum@xxxxxxx are
origin.patch
agp-prevent-probe-collision-of-sis-agp-and-amd64_agp.patch
git-dvb.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
