Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c25a2c8 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: hub: fix SS hub-descriptor handling 



A SuperSpeed hub descriptor does not have any variable-length fields so
bail out when reading a short descriptor.

This avoids parsing and leaking two bytes of uninitialised slab data
through sysfs removable-attributes.

Fixes: dbe79bbe ("USB 3.0 Hub Changes")
Cc: stable <stable@vger.kernel.org>     # 2.6.39
Cc: John Youn <John.Youn@synopsys.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec963b41

drivers/usb/core/hub.c

+6 −2
Original line number Diff line number Diff line
@@ -380,9 +380,13 @@ static int get_hub_descriptor(struct usb_device *hdev, void *data) 
			USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,

			dtype << 8, 0, data, size,

			USB_CTRL_GET_TIMEOUT);

		if (ret >= (USB_DT_HUB_NONVAR_SIZE + 2))

		if (hub_is_superspeed(hdev)) {

			if (ret == size)

				return ret;

		} else if (ret >= (USB_DT_HUB_NONVAR_SIZE + 2)) {

			return ret;

		}

	}

	return -EINVAL;

}
@@ -1321,7 +1325,7 @@ static int hub_configure(struct usb_hub *hub, 


	/* Request the entire hub descriptor.

	 * hub->descriptor can handle USB_MAXCHILDREN ports,

	 * but the hub can/will return fewer bytes here.

	 * but a (non-SS) hub can/will return fewer bytes here.

	 */

	ret = get_hub_descriptor(hdev, hub->descriptor);

	if (ret < 0) {