[patch] Input: wacom - check for allocation failure in probe()

Subsystems: input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE5252d

2 messages, 2 authors, 2012-03-27 · open the first message on its own page

[patch] Input: wacom - check for allocation failure in probe()

From: Dan Carpenter <hidden>
Date: 2012-03-27 20:15:29

We accidentally removed the check for NULL in 3aac0ef10b "Input: wacom -
isolate input registration".

Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 19ba586..0d26921 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1002,6 +1002,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 		return -EINVAL;
 
 	wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
+	if (!wacom)
+		return -ENOMEM;
 
 	wacom_wac = &wacom->wacom_wac;
 	wacom_wac->features = *((struct wacom_features *)id->driver_info);

Re: [patch] Input: wacom - check for allocation failure in probe()

From: Chris Bagwell <hidden>
Date: 2012-03-27 20:39:12

Thanks for catch.

Reviewed-by: Chris Bagwell <redacted>

On Tue, Mar 27, 2012 at 3:15 PM, Dan Carpenter [off-list ref] wrote:
quoted hunk
We accidentally removed the check for NULL in 3aac0ef10b "Input: wacom -
isolate input registration".

Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 19ba586..0d26921 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1002,6 +1002,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
               return -EINVAL;

       wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
+       if (!wacom)
+               return -ENOMEM;

       wacom_wac = &wacom->wacom_wac;
       wacom_wac->features = *((struct wacom_features *)id->driver_info);
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help