Commit 46aeeb2a authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: wusbcore: fix NULL-deref at probe

commit 03ace948 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: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4887ea5
...@@ -39,6 +39,9 @@ int wa_create(struct wahc *wa, struct usb_interface *iface, ...@@ -39,6 +39,9 @@ int wa_create(struct wahc *wa, struct usb_interface *iface,
int result; int result;
struct device *dev = &iface->dev; struct device *dev = &iface->dev;
if (iface->cur_altsetting->desc.bNumEndpoints < 3)
return -ENODEV;
result = wa_rpipes_create(wa); result = wa_rpipes_create(wa);
if (result < 0) if (result < 0)
goto error_rpipes_create; goto error_rpipes_create;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment