diff options
author | Krzysztof Mazur <krzysiek@podlesie.net> | 2013-08-22 08:49:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-23 13:47:17 -0400 |
commit | e58547eb9561a8a72d46e2d411090a614d33ac0e (patch) | |
tree | 1952a435bc6a5c710df71c8692f5af9ca2ee0c7f | |
parent | d0308d4b6b02597f39fc31a9bddf7bb3faad5622 (diff) |
usb: fail on usb_hub_create_port_device() errors
Ignoring usb_hub_create_port_device() errors cause later NULL pointer
deference when uninitialized hub->ports[i] entries are dereferenced
after port memory allocation error.
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>
-rw-r--r-- | drivers/usb/core/hub.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 22811f1f86f3..79ec4a7640cd 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1562,10 +1562,15 @@ static int hub_configure(struct usb_hub *hub, | |||
1562 | if (hub->has_indicators && blinkenlights) | 1562 | if (hub->has_indicators && blinkenlights) |
1563 | hub->indicator [0] = INDICATOR_CYCLE; | 1563 | hub->indicator [0] = INDICATOR_CYCLE; |
1564 | 1564 | ||
1565 | for (i = 0; i < hdev->maxchild; i++) | 1565 | for (i = 0; i < hdev->maxchild; i++) { |
1566 | if (usb_hub_create_port_device(hub, i + 1) < 0) | 1566 | ret = usb_hub_create_port_device(hub, i + 1); |
1567 | if (ret < 0) { | ||
1567 | dev_err(hub->intfdev, | 1568 | dev_err(hub->intfdev, |
1568 | "couldn't create port%d device.\n", i + 1); | 1569 | "couldn't create port%d device.\n", i + 1); |
1570 | hdev->maxchild = i; | ||
1571 | goto fail_keep_maxchild; | ||
1572 | } | ||
1573 | } | ||
1569 | 1574 | ||
1570 | usb_hub_adjust_deviceremovable(hdev, hub->descriptor); | 1575 | usb_hub_adjust_deviceremovable(hdev, hub->descriptor); |
1571 | 1576 | ||
@@ -1574,6 +1579,7 @@ static int hub_configure(struct usb_hub *hub, | |||
1574 | 1579 | ||
1575 | fail: | 1580 | fail: |
1576 | hdev->maxchild = 0; | 1581 | hdev->maxchild = 0; |
1582 | fail_keep_maxchild: | ||
1577 | dev_err (hub_dev, "config failed, %s (err %d)\n", | 1583 | dev_err (hub_dev, "config failed, %s (err %d)\n", |
1578 | message, ret); | 1584 | message, ret); |
1579 | /* hub_disconnect() frees urb and descriptor */ | 1585 | /* hub_disconnect() frees urb and descriptor */ |