Commit 46aeeb2a authored Mar 13, 2017 by Johan Hovold Committed by Greg Kroah-Hartman Mar 30, 2017

USB: wusbcore: fix NULL-deref at probe



commit 03ace948a4eb89d1cf51c06afdfc41ebca5fdb27 upstream.

Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.

This specifically fixes the NULL-pointer dereference when probing HWA HC
devices.

Fixes: df365423 ("wusb: add the Wire Adapter (WA) core")
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Cc: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a4887ea5

drivers/usb/wusbcore/wa-hc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,9 @@ int wa_create(struct wahc wa, struct usb_interface iface,
		int result;
		struct device *dev = &iface->dev;

		if (iface->cur_altsetting->desc.bNumEndpoints < 3)
		return -ENODEV;

		result = wa_rpipes_create(wa);
		if (result < 0)
		goto error_rpipes_create;