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

Commit 32530efa authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

usb: usbtest: fix NULL pointer dereference 



commit 7c80f9e4a588f1925b07134bb2e3689335f6c6d8 upstream.

If the usbtest driver encounters a device with an IN bulk endpoint but
no OUT bulk endpoint, it will try to dereference a NULL pointer
(out->desc.bEndpointAddress).  The problem can be solved by adding a
missing test.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Tested-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 241d7ab1

drivers/usb/misc/usbtest.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -183,12 +183,13 @@ found: 
			return tmp;

			return tmp;

	}

	}





	if (in) {

	if (in)

		dev->in_pipe = usb_rcvbulkpipe(udev,

		dev->in_pipe = usb_rcvbulkpipe(udev,

			in->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);

			in->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);

	if (out)

		dev->out_pipe = usb_sndbulkpipe(udev,

		dev->out_pipe = usb_sndbulkpipe(udev,

			out->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);

			out->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);

	}



	if (iso_in) {

	if (iso_in) {

		dev->iso_in = &iso_in->desc;

		dev->iso_in = &iso_in->desc;

		dev->in_iso_pipe = usb_rcvisocpipe(udev,

		dev->in_iso_pipe = usb_rcvisocpipe(udev,