Skip to content

Commit 77ec960

Browse files
r-c-nsfX-bot
authored andcommitted
usb: hub: Guard against accesses to uninitialized BOS descriptors
commit f74a7afc224acd5e922c7a2e52244d891bbe44ee upstream. Many functions in drivers/usb/core/hub.c and drivers/usb/core/hub.h access fields inside udev->bos without checking if it was allocated and initialized. If usb_get_bos_descriptor() fails for whatever reason, udev->bos will be NULL and those accesses will result in a crash: BUG: kernel NULL pointer dereference, address: 0000000000000018 PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 5 PID: 17818 Comm: kworker/5:1 Tainted: G W 5.15.108-18910-gab0e1cb584e1 #1 <HASH:1f9e 1> Hardware name: Google Kindred/Kindred, BIOS Google_Kindred.12672.413.0 02/03/2021 Workqueue: usb_hub_wq hub_event RIP: 0010:hub_port_reset+0x193/0x788 Code: 89 f7 e8 20 f7 15 00 48 8b 43 08 80 b8 96 03 00 00 03 75 36 0f b7 88 92 03 00 00 81 f9 10 03 00 00 72 27 48 8b 80 a8 03 00 00 <48> 83 78 18 00 74 19 48 89 df 48 8b 75 b0 ba 02 00 00 00 4c 89 e9 RSP: 0018:ffffab740c53fcf8 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffffa1bc5f678000 RCX: 0000000000000310 RDX: fffffffffffffdff RSI: 0000000000000286 RDI: ffffa1be9655b840 RBP: ffffab740c53fd70 R08: 00001b7d5edaa20c R09: ffffffffb005e060 R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000 R13: ffffab740c53fd3e R14: 0000000000000032 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffffa1be96540000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000018 CR3: 000000022e80c005 CR4: 00000000003706e0 Call Trace: hub_event+0x73f/0x156e ? hub_activate+0x5b7/0x68f process_one_work+0x1a2/0x487 worker_thread+0x11a/0x288 kthread+0x13a/0x152 ? process_one_work+0x487/0x487 ? kthread_associate_blkcg+0x70/0x70 ret_from_fork+0x1f/0x30 Fall back to a default behavior if the BOS descriptor isn't accessible and skip all the functionalities that depend on it: LPM support checks, Super Speed capabilitiy checks, U1/U2 states setup. Signed-off-by: Ricardo Cañuelo <[email protected]> Cc: stable <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ee17ecc commit 77ec960

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

drivers/usb/core/hub.c

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ int usb_device_supports_lpm(struct usb_device *udev)
148148
if (udev->quirks & USB_QUIRK_NO_LPM)
149149
return 0;
150150

151+
/* Skip if the device BOS descriptor couldn't be read */
152+
if (!udev->bos)
153+
return 0;
154+
151155
/* USB 2.1 (and greater) devices indicate LPM support through
152156
* their USB 2.0 Extended Capabilities BOS descriptor.
153157
*/
@@ -324,6 +328,10 @@ static void usb_set_lpm_parameters(struct usb_device *udev)
324328
if (!udev->lpm_capable || udev->speed < USB_SPEED_SUPER)
325329
return;
326330

331+
/* Skip if the device BOS descriptor couldn't be read */
332+
if (!udev->bos)
333+
return;
334+
327335
hub = usb_hub_to_struct_hub(udev->parent);
328336
/* It doesn't take time to transition the roothub into U0, since it
329337
* doesn't have an upstream link.
@@ -2679,7 +2687,8 @@ int usb_authorize_device(struct usb_device *usb_dev)
26792687
}
26802688

26812689
/*
2682-
* Return 1 if port speed is SuperSpeedPlus, 0 otherwise
2690+
* Return 1 if port speed is SuperSpeedPlus, 0 otherwise or if the
2691+
* capability couldn't be checked.
26832692
* check it from the link protocol field of the current speed ID attribute.
26842693
* current speed ID is got from ext port status request. Sublink speed attribute
26852694
* table is returned with the hub BOS SSP device capability descriptor
@@ -2689,8 +2698,12 @@ static int port_speed_is_ssp(struct usb_device *hdev, int speed_id)
26892698
int ssa_count;
26902699
u32 ss_attr;
26912700
int i;
2692-
struct usb_ssp_cap_descriptor *ssp_cap = hdev->bos->ssp_cap;
2701+
struct usb_ssp_cap_descriptor *ssp_cap;
26932702

2703+
if (!hdev->bos)
2704+
return 0;
2705+
2706+
ssp_cap = hdev->bos->ssp_cap;
26942707
if (!ssp_cap)
26952708
return 0;
26962709

@@ -4151,8 +4164,15 @@ static void usb_enable_link_state(struct usb_hcd *hcd, struct usb_device *udev,
41514164
enum usb3_link_state state)
41524165
{
41534166
int timeout, ret;
4154-
__u8 u1_mel = udev->bos->ss_cap->bU1devExitLat;
4155-
__le16 u2_mel = udev->bos->ss_cap->bU2DevExitLat;
4167+
__u8 u1_mel;
4168+
__le16 u2_mel;
4169+
4170+
/* Skip if the device BOS descriptor couldn't be read */
4171+
if (!udev->bos)
4172+
return;
4173+
4174+
u1_mel = udev->bos->ss_cap->bU1devExitLat;
4175+
u2_mel = udev->bos->ss_cap->bU2DevExitLat;
41564176

41574177
/* If the device says it doesn't have *any* exit latency to come out of
41584178
* U1 or U2, it's probably lying. Assume it doesn't implement that link

drivers/usb/core/hub.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static inline int hub_is_superspeedplus(struct usb_device *hdev)
145145
{
146146
return (hdev->descriptor.bDeviceProtocol == USB_HUB_PR_SS &&
147147
le16_to_cpu(hdev->descriptor.bcdUSB) >= 0x0310 &&
148-
hdev->bos->ssp_cap);
148+
hdev->bos && hdev->bos->ssp_cap);
149149
}
150150

151151
static inline unsigned hub_power_on_good_delay(struct usb_hub *hub)

0 commit comments

Comments
 (0)