diff options
| author | Sven Schnelle <svens@stackframe.org> | 2012-08-17 21:43:43 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:40:56 +0200 |
| commit | 65525984d5eebb61afd53fa5dabe561cae5ee88d (patch) | |
| tree | ce7a7791bedc23c631b55b2be990ec1ab0431916 | |
| parent | 80bc5ec142033266d5511bb299a738f816d520b9 (diff) | |
| download | lwn-65525984d5eebb61afd53fa5dabe561cae5ee88d.tar.gz lwn-65525984d5eebb61afd53fa5dabe561cae5ee88d.zip | |
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 653f85309762..8ad9dfb75038 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1120,7 +1120,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; |