Commit 14f378cd authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: hub: fix non-SS hub-descriptor handling

commit bec444cd upstream.

Add missing sanity check on the non-SuperSpeed hub-descriptor length in
order to avoid parsing and leaking two bytes of uninitialised slab data
through sysfs removable-attributes (or a compound-device debug
statement).

Note that we only make sure that the DeviceRemovable field is always
present (and specifically ignore the unused PortPwrCtrlMask field) in
order to continue support any hubs with non-compliant descriptors. As a
further safeguard, the descriptor buffer is also cleared.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e6a3e9e0
...@@ -359,7 +359,8 @@ static void usb_set_lpm_parameters(struct usb_device *udev) ...@@ -359,7 +359,8 @@ static void usb_set_lpm_parameters(struct usb_device *udev)
} }
/* USB 2.0 spec Section 11.24.4.5 */ /* USB 2.0 spec Section 11.24.4.5 */
static int get_hub_descriptor(struct usb_device *hdev, void *data) static int get_hub_descriptor(struct usb_device *hdev,
struct usb_hub_descriptor *desc)
{ {
int i, ret, size; int i, ret, size;
unsigned dtype; unsigned dtype;
...@@ -375,12 +376,16 @@ static int get_hub_descriptor(struct usb_device *hdev, void *data) ...@@ -375,12 +376,16 @@ static int get_hub_descriptor(struct usb_device *hdev, void *data)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
ret = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0), ret = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB, USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
dtype << 8, 0, data, size, dtype << 8, 0, desc, size,
USB_CTRL_GET_TIMEOUT); USB_CTRL_GET_TIMEOUT);
if (hub_is_superspeed(hdev)) { if (hub_is_superspeed(hdev)) {
if (ret == size) if (ret == size)
return ret; return ret;
} else if (ret >= (USB_DT_HUB_NONVAR_SIZE + 2)) { } else if (ret >= USB_DT_HUB_NONVAR_SIZE + 2) {
/* Make sure we have the DeviceRemovable field. */
size = USB_DT_HUB_NONVAR_SIZE + desc->bNbrPorts / 8 + 1;
if (ret < size)
return -EMSGSIZE;
return ret; return ret;
} }
} }
...@@ -1327,7 +1332,7 @@ static int hub_configure(struct usb_hub *hub, ...@@ -1327,7 +1332,7 @@ static int hub_configure(struct usb_hub *hub,
} }
mutex_init(&hub->status_mutex); mutex_init(&hub->status_mutex);
hub->descriptor = kmalloc(sizeof(*hub->descriptor), GFP_KERNEL); hub->descriptor = kzalloc(sizeof(*hub->descriptor), GFP_KERNEL);
if (!hub->descriptor) { if (!hub->descriptor) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment