]> Pileus Git - ~andy/linux/commitdiff
usb: fix cleanup after failure in hub_configure()
authorKrzysztof Mazur <krzysiek@podlesie.net>
Thu, 22 Aug 2013 12:49:38 +0000 (14:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Aug 2013 17:46:03 +0000 (10:46 -0700)
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>
drivers/usb/core/hub.c

index 175179eb17eef3ae68e04b12fe59f3c9ec6c9c2d..22811f1f86f3aa0bc8ebf17e7da915a823c7f720 100644 (file)
@@ -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 */