[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200707220006.20359.jesper.juhl@gmail.com>
Date: Sun, 22 Jul 2007 00:06:20 +0200
From: Jesper Juhl <jesper.juhl@...il.com>
To: Jiri Kosina <jkosina@...e.cz>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Michael Haboustak <mike-@...ci.rr.com>,
Andreas Gal <gal@....edu>, Vojtech Pavlik <vojtech@...e.cz>,
Greg Kroah-Hartman <greg@...ah.com>,
linux-input@...ey.karlin.mff.cuni.cz,
Jesper Juhl <jesper.juhl@...il.com>
Subject: [PATCH][hid] Fix a NULL pointer dereference when we fail to allocate memory
Hi,
If, in usb_hid_configure(), we fail to allocate storage for 'usbhid',
"if (!(usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL)))",
then we'll jump to the 'fail:' label where we have this code:
usb_free_urb(usbhid->urbin);
usb_free_urb(usbhid->urbout);
usb_free_urb(usbhid->urbctrl);
Since we got here because we couldn't allocate storage for 'usbhid',
what we have here is a NULL pointer dereference - ouch...
This patch solves that little problem by adding a new
'fail_no_usbhid:' label after the problematic calls to
usb_free_urb() and jumps to that one instead, in the problem case.
Signed-off-by: Jesper Juhl <jesper.juhl@...il.com>
---
drivers/hid/usbhid/hid-core.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index b2baeae..3ff7468 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -743,7 +743,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
hid->quirks = quirks;
if (!(usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL)))
- goto fail;
+ goto fail_no_usbhid;
hid->driver_data = usbhid;
usbhid->hid = hid;
@@ -877,6 +877,7 @@ fail:
usb_free_urb(usbhid->urbin);
usb_free_urb(usbhid->urbout);
usb_free_urb(usbhid->urbctrl);
+fail_no_usbhid:
hid_free_buffers(dev, hid);
hid_free_device(hid);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists