diff options
author | Krzysztof Mazur <krzysiek@podlesie.net> | 2013-08-22 08:49:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-23 13:46:03 -0400 |
commit | d0308d4b6b02597f39fc31a9bddf7bb3faad5622 (patch) | |
tree | 8da05e1476268cccff8c3c36248a3a343d6e120d /drivers/usb | |
parent | f375fc520d4df0cd9fcb570f33c103c6c0311f9e (diff) |
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, | |||
1573 | return 0; | 1573 | return 0; |
1574 | 1574 | ||
1575 | fail: | 1575 | fail: |
1576 | hdev->maxchild = 0; | ||
1576 | dev_err (hub_dev, "config failed, %s (err %d)\n", | 1577 | dev_err (hub_dev, "config failed, %s (err %d)\n", |
1577 | message, ret); | 1578 | message, ret); |
1578 | /* hub_disconnect() frees urb and descriptor */ | 1579 | /* hub_disconnect() frees urb and descriptor */ |