diff options
author | Krzysztof Mazur <krzysiek@podlesie.net> | 2013-08-22 08:49:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-20 15:27:47 -0500 |
commit | 734268997d0e68caa9149787d8dd70875bd6aaf2 (patch) | |
tree | 7d9587b300f283f7b99dfcc9afdf0bfeb55f8029 /drivers/usb/core | |
parent | 4790536896fd1e76949e58530dac2ba82354bd28 (diff) |
usb: fix cleanup after failure in hub_configure()
commit d0308d4b6b02597f39fc31a9bddf7bb3faad5622 upstream.
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/core')
-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 6cf2ae0aa1f7..a7515d165390 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1568,6 +1568,7 @@ static int hub_configure(struct usb_hub *hub, | |||
1568 | return 0; | 1568 | return 0; |
1569 | 1569 | ||
1570 | fail: | 1570 | fail: |
1571 | hdev->maxchild = 0; | ||
1571 | dev_err (hub_dev, "config failed, %s (err %d)\n", | 1572 | dev_err (hub_dev, "config failed, %s (err %d)\n", |
1572 | message, ret); | 1573 | message, ret); |
1573 | /* hub_disconnect() frees urb and descriptor */ | 1574 | /* hub_disconnect() frees urb and descriptor */ |