diff options
| author | Sven Schnelle <svens@stackframe.org> | 2012-08-17 21:43:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 10:00:43 -0700 |
| commit | 52340b63f6cf9f21051a8f91f42d8ca97415bd1a (patch) | |
| tree | 39d5d66db6e289f6aa5851fb3c471c5671c046f8 /drivers/usb | |
| parent | 9f48c235c9f8e7c13544f4a2d4b9a728cf257f45 (diff) | |
| download | kernel_samsung_smdk4412-52340b63f6cf9f21051a8f91f42d8ca97415bd1a.zip kernel_samsung_smdk4412-52340b63f6cf9f21051a8f91f42d8ca97415bd1a.tar.gz kernel_samsung_smdk4412-52340b63f6cf9f21051a8f91f42d8ca97415bd1a.tar.bz2 | |
USB: CDC ACM: Fix NULL pointer dereference
commit 99f347caa4568cb803862730b3b1f1942639523f upstream.
If a device specifies zero endpoints in its interface descriptor,
the kernel oopses in acm_probe(). Even though that's clearly an
invalid descriptor, we should test wether we have all endpoints.
This is especially bad as this oops can be triggered by just
plugging a USB device in.
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 496e06e..de80171 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1043,7 +1043,8 @@ skip_normal_probe: } - if (data_interface->cur_altsetting->desc.bNumEndpoints < 2) + if (data_interface->cur_altsetting->desc.bNumEndpoints < 2 || + control_interface->cur_altsetting->desc.bNumEndpoints == 0) return -EINVAL; epctrl = &control_interface->cur_altsetting->endpoint[0].desc; |