|
 |
23f3bf1 |
From 7c80f9e4a588f1925b07134bb2e3689335f6c6d8 Mon Sep 17 00:00:00 2001
|
|
|
23f3bf1 |
From: Alan Stern <stern@rowland.harvard.edu>
|
|
|
23f3bf1 |
Date: Fri, 29 Sep 2017 10:54:24 -0400
|
|
|
23f3bf1 |
Subject: [PATCH] usb: usbtest: fix NULL pointer dereference
|
|
|
23f3bf1 |
|
|
|
23f3bf1 |
If the usbtest driver encounters a device with an IN bulk endpoint but
|
|
|
23f3bf1 |
no OUT bulk endpoint, it will try to dereference a NULL pointer
|
|
|
23f3bf1 |
(out->desc.bEndpointAddress). The problem can be solved by adding a
|
|
|
23f3bf1 |
missing test.
|
|
|
23f3bf1 |
|
|
|
23f3bf1 |
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
|
|
|
23f3bf1 |
Reported-by: Andrey Konovalov <andreyknvl@google.com>
|
|
|
23f3bf1 |
Tested-by: Andrey Konovalov <andreyknvl@google.com>
|
|
|
23f3bf1 |
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|
|
23f3bf1 |
---
|
|
|
23f3bf1 |
drivers/usb/misc/usbtest.c | 5 +++--
|
|
|
23f3bf1 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
23f3bf1 |
|
|
|
23f3bf1 |
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
|
|
|
23f3bf1 |
index 113e38bfe0ef..b3fc602b2e24 100644
|
|
|
23f3bf1 |
--- a/drivers/usb/misc/usbtest.c
|
|
|
23f3bf1 |
+++ b/drivers/usb/misc/usbtest.c
|
|
|
23f3bf1 |
@@ -202,12 +202,13 @@ get_endpoints(struct usbtest_dev *dev, struct usb_interface *intf)
|
|
|
23f3bf1 |
return tmp;
|
|
|
23f3bf1 |
}
|
|
|
23f3bf1 |
|
|
|
23f3bf1 |
- if (in) {
|
|
|
23f3bf1 |
+ if (in)
|
|
|
23f3bf1 |
dev->in_pipe = usb_rcvbulkpipe(udev,
|
|
|
23f3bf1 |
in->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
|
|
|
23f3bf1 |
+ if (out)
|
|
|
23f3bf1 |
dev->out_pipe = usb_sndbulkpipe(udev,
|
|
|
23f3bf1 |
out->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
|
|
|
23f3bf1 |
- }
|
|
|
23f3bf1 |
+
|
|
|
23f3bf1 |
if (iso_in) {
|
|
|
23f3bf1 |
dev->iso_in = &iso_in->desc;
|
|
|
23f3bf1 |
dev->in_iso_pipe = usb_rcvisocpipe(udev,
|
|
|
23f3bf1 |
--
|
|
|
23f3bf1 |
2.13.6
|
|
|
23f3bf1 |
|