diff options
| author | Johan Hovold <johan@kernel.org> | 2017-03-13 13:47:53 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-06-17 15:54:26 +0200 |
| commit | 92b39f43189794b439f1defd71c37aeb2baf4195 (patch) | |
| tree | 9eb4bd6e4adc5581da2703b655dec39380efaf0e | |
| parent | c1e6c8aa0dad93e62e57692a126737358ec7a332 (diff) | |
| download | android_kernel_m2note-92b39f43189794b439f1defd71c37aeb2baf4195.tar.gz | |
uwb: i1480-dfu: fix NULL-deref at probe
commit 4ce362711d78a4999011add3115b8f4b0bc25e8c upstream.
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: 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: Willy Tarreau <w@1wt.eu>
| -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 2bfc846ac..6345e8582 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) { |