Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1377101

[PATCH 3.16.y-ckt 11/17] USB: cdc-acm: more sanity checking

Show all headers | View raw

3.16.7-ckt27 -stable review patch.  If anyone has any objections, please let me know.

---8<------------------------------------------------------------

From: Oliver Neukum <oneukum@suse.com>

commit 8835ba4a39cf53f705417b3b3a94eb067673f2c9 upstream.

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.

Signed-off-by: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Moritz Muehlenhoff <jmm@inutil.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/usb/class/cdc-acm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 332be4c5745c..54061a3bc5e9 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1104,6 +1104,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;
 	}
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[3.16.y-ckt stable] Linux 3.16.7-ckt27 stable review Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:10 +0200
  [PATCH 3.16.y-ckt 14/17] x86/iopl/64: Properly context-switch IOPL on Xen PV Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:10 +0200
  [PATCH 3.16.y-ckt 13/17] cpu: Provide smpboot_thread_init() on !CONFIG_SMP kernels as well Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:10 +0200
  [PATCH 3.16.y-ckt 15/17] staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:10 +0200
  [PATCH 3.16.y-ckt 16/17] drm/radeon: hold reference to fences in radeon_sa_bo_new (3.17 and older) Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:10 +0200
  [PATCH 3.16.y-ckt 04/17] ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk() Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:10 +0200
  [PATCH 3.16.y-ckt 09/17] ipr: Fix regression when loading firmware Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 02/17] Input: powermate - fix oops with malicious USB descriptors Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 05/17] ALSA: usb-audio: Add sanity checks for endpoint accesses Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 12/17] ceph: fix request time stamp encoding Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 10/17] Input: ati_remote2 - fix crashes on detecting device with invalid descriptor Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 07/17] cpu: Defer smpboot kthread unparking until CPU known to scheduler Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 03/17] USB: iowarrior: fix oops with malicious USB descriptors Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 11/17] USB: cdc-acm: more sanity checking Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 08/17] ipr: Fix out-of-bounds null overwrite Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 01/17] ipv4: Don't do expensive useless work during inetdev destroy. Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200
  [PATCH 3.16.y-ckt 06/17] include/linux/poison.h: fix LIST_POISON{1,2} offset Luis Henriques <luis.henriques@canonical.com> - 2016-04-12 20:20 +0200

csiph-web