diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-13 13:47:53 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-14 17:07:31 +0800 |
commit | 4ce362711d78a4999011add3115b8f4b0bc25e8c (patch) | |
tree | 3239393c08641bf1d405c88f8761bba4ca6e8287 /drivers/uwb | |
parent | daf229b15907fbfdb6ee183aac8ca428cb57e361 (diff) | |
download | blackbird-op-linux-4ce362711d78a4999011add3115b8f4b0bc25e8c.tar.gz blackbird-op-linux-4ce362711d78a4999011add3115b8f4b0bc25e8c.zip |
uwb: i1480-dfu: fix NULL-deref at probe
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.
Note that the dereference happens in the cmd and wait_init_done
callbacks which are called during probe.
Fixes: 1ba47da52712 ("uwb: add the i1480 DFU driver")
Cc: stable <stable@vger.kernel.org> # 2.6.28
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>
Diffstat (limited to 'drivers/uwb')
-rw-r--r-- | drivers/uwb/i1480/dfu/usb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index 2bfc846ac071..6345e85822a4 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c @@ -362,6 +362,9 @@ int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id) result); } + if (iface->cur_altsetting->desc.bNumEndpoints < 1) + return -ENODEV; + result = -ENOMEM; i1480_usb = kzalloc(sizeof(*i1480_usb), GFP_KERNEL); if (i1480_usb == NULL) { |