diff options
author | Krzysztof Mazur <krzysiek@podlesie.net> | 2013-08-22 14:49:38 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-23 19:46:03 +0200 |
commit | d0308d4b6b02597f39fc31a9bddf7bb3faad5622 (patch) | |
tree | 8da05e1476268cccff8c3c36248a3a343d6e120d /drivers/usb | |
parent | usb: ehci-mxc: check for pdata before dereferencing (diff) | |
download | linux-d0308d4b6b02597f39fc31a9bddf7bb3faad5622.tar.xz linux-d0308d4b6b02597f39fc31a9bddf7bb3faad5622.zip |
usb: fix cleanup after failure in hub_configure()
If the hub_configure() fails after setting the hdev->maxchild
the hub->ports might be NULL or point to uninitialized kzallocated
memory causing NULL pointer dereference in hub_quiesce() during cleanup.
Now after such error the hdev->maxchild is set to 0 to avoid cleanup
of uninitialized ports.
Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/hub.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 175179eb17ee..22811f1f86f3 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1573,6 +1573,7 @@ static int hub_configure(struct usb_hub *hub, return 0; fail: + hdev->maxchild = 0; dev_err (hub_dev, "config failed, %s (err %d)\n", message, ret); /* hub_disconnect() frees urb and descriptor */ |