Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe

The `ar_usb` field of `ath10k_usb_pipe_usb_pipe` objects
are initialized to point to the containing `ath10k_usb` object
according to endpoint descriptors read from the device side, as shown
below in `ath10k_usb_setup_pipe_resources`:

for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
endpoint = &iface_desc->endpoint[i].desc;

// get the address from endpoint descriptor
pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb,
endpoint->bEndpointAddress,
&urbcount);
......
// select the pipe object
pipe = &ar_usb->pipes[pipe_num];

// initialize the ar_usb field
pipe->ar_usb = ar_usb;
}

The driver assumes that the addresses reported in endpoint
descriptors from device side to be complete. If a device is
malicious and does not report complete addresses, it may trigger
NULL-ptr-deref `ath10k_usb_alloc_urb_from_pipe` and
`ath10k_usb_free_urb_to_pipe`.

This patch fixes the bug by preventing potential NULL-ptr-deref.

Signed-off-by: Hui Peng <benquike@gmail.com>
Reported-by: Hui Peng <benquike@gmail.com>
Reported-by: Mathias Payer <mathias.payer@nebelwelt.net>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[groeck: Add driver tag to subject, fix build warning]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Hui Peng and committed by
Kalle Valo
bfd6e6e6 d43810b2

+8
+8
drivers/net/wireless/ath/ath10k/usb.c
··· 38 38 struct ath10k_urb_context *urb_context = NULL; 39 39 unsigned long flags; 40 40 41 + /* bail if this pipe is not initialized */ 42 + if (!pipe->ar_usb) 43 + return NULL; 44 + 41 45 spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags); 42 46 if (!list_empty(&pipe->urb_list_head)) { 43 47 urb_context = list_first_entry(&pipe->urb_list_head, ··· 58 54 struct ath10k_urb_context *urb_context) 59 55 { 60 56 unsigned long flags; 57 + 58 + /* bail if this pipe is not initialized */ 59 + if (!pipe->ar_usb) 60 + return; 61 61 62 62 spin_lock_irqsave(&pipe->ar_usb->cs_lock, flags); 63 63