diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2014-11-13 09:20:59 +0300 |
|---|---|---|
| committer |   Felipe Balbi <balbi@ti.com> | 2014-11-18 08:47:44 -0600 |
| commit | 0448d38c1e8cd64fb2fa88f44cbc7c3dcf75ed6c (patch) | |
| tree | 394b9a301440c096215d0ae053943ce7dd1a40c0 /drivers/usb/gadget/function/f_hid.c | |
| parent | usb: gadget: f_hid: use after free in hidg_alloc_inst() (diff) | |
| download | linux-dev-0448d38c1e8cd64fb2fa88f44cbc7c3dcf75ed6c.tar.xz linux-dev-0448d38c1e8cd64fb2fa88f44cbc7c3dcf75ed6c.zip | |
usb: gadget: f_hid: fix error handling in ghid_setup()
There were a two issues here.
1) We returned PTR_ERR(NULL) which means success if class_create()
failed.
2) If alloc_chrdev_region() failed then we should clean up before
returning.
Also kernel style is to have "error handling" as opposed to "success
handling". In the original code checking for "if (!status) " is
confusing and this bad style is what lead to bug #2.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/f_hid.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_hid.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c index f0545f801c9d..488ac66aae9e 100644 --- a/drivers/usb/gadget/function/f_hid.c +++ b/drivers/usb/gadget/function/f_hid.c @@ -972,17 +972,22 @@ int ghid_setup(struct usb_gadget *g, int count) hidg_class = class_create(THIS_MODULE, "hidg"); if (IS_ERR(hidg_class)) { + status = PTR_ERR(hidg_class); hidg_class = NULL; - return PTR_ERR(hidg_class); + return status; } status = alloc_chrdev_region(&dev, 0, count, "hidg"); - if (!status) { - major = MAJOR(dev); - minors = count; + if (status) { + class_destroy(hidg_class); + hidg_class = NULL; + return status; } - return status; + major = MAJOR(dev); + minors = count; + + return 0; } void ghid_cleanup(void) |