diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-03-15 10:14:04 +0100 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2016-10-12 23:26:40 +0200 |
| commit | cf4d4e5f5188fef12351fb90313aad5d736b3632 (patch) | |
| tree | 41bd1d6c9ed15e3dda0ba2c1817465dcb46a7bec /drivers/usb/class | |
| parent | ee3189e9285d051a7d7dac785dcd0c51773bf3aa (diff) | |
| download | kernel_samsung_espresso10-cf4d4e5f5188fef12351fb90313aad5d736b3632.zip kernel_samsung_espresso10-cf4d4e5f5188fef12351fb90313aad5d736b3632.tar.gz kernel_samsung_espresso10-cf4d4e5f5188fef12351fb90313aad5d736b3632.tar.bz2 | |
USB: cdc-acm: more sanity checking
An attack has become available which pretends to be a quirky
device circumventing normal sanity checks and crashes the kernel
by an insufficient number of interfaces. This patch adds a check
to the code path for quirky devices.
Change-Id: Ie96a95d833e4ca9c3c3c3557679115ffb7069b5b
Signed-off-by: Oliver Neukum <ONeukum@suse.com>
CC: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 84e69ea..c8fee56 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -895,6 +895,9 @@ static int acm_probe(struct usb_interface *intf, if (quirks == NO_UNION_NORMAL) { data_interface = usb_ifnum_to_if(usb_dev, 1); control_interface = usb_ifnum_to_if(usb_dev, 0); + /* we would crash */ + if (!data_interface || !control_interface) + return -ENODEV; goto skip_normal_probe; } |