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

Groups > linux.kernel > #1715129

[PATCH 3.16 019/134] cdc-acm: fix possible invalid access when processing notification

Show all headers | View raw

3.16.47-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Tobias Herzog <t-herzog@gmx.de>

commit 1bb9914e1730417d530de9ed37e59efdc647146b upstream.

Notifications may only be 8 bytes long. Accessing the 9th and
10th byte of unimplemented/unknown notifications may be insecure.
Also check the length of known notifications before accessing anything
behind the 8th byte.

Signed-off-by: Tobias Herzog <t-herzog@gmx.de>
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/usb/class/cdc-acm.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -312,6 +312,12 @@ static void acm_ctrl_irq(struct urb *urb
 		break;
 
 	case USB_CDC_NOTIFY_SERIAL_STATE:
+		if (le16_to_cpu(dr->wLength) != 2) {
+			dev_dbg(&acm->control->dev,
+				"%s - malformed serial state\n", __func__);
+			break;
+		}
+
 		newctrl = get_unaligned_le16(data);
 
 		if (!acm->clocal && (acm->ctrlin & ~newctrl & ACM_CTRL_DCD)) {
@@ -348,11 +354,10 @@ static void acm_ctrl_irq(struct urb *urb
 
 	default:
 		dev_dbg(&acm->control->dev,
-			"%s - unknown notification %d received: index %d "
-			"len %d data0 %d data1 %d\n",
+			"%s - unknown notification %d received: index %d len %d\n",
 			__func__,
-			dr->bNotificationType, dr->wIndex,
-			dr->wLength, data[0], data[1]);
+			dr->bNotificationType, dr->wIndex, dr->wLength);
+
 		break;
 	}
 exit:

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

Thread

[PATCH 3.16 000/134] 3.16.47-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 005/134] ima: accept previously set IMA_NEW_FILE Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 010/134] pinctrl: sh-pfc: Update info pointer after  SoC-specific init Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 008/134] perf hists browser: Fix typo in function  switch_data_file Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 015/134] [media] serial_ir: iommap is a memory  address, not bool Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 016/134] [media] mceusb: fix NULL-deref at probe Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 013/134] usb: hub: Do not attempt to autosuspend  disconnected devices Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 018/134] USB: Proper handling of Race Condition when  two USB class drivers try to call init_usb_class simultaneously Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 012/134] usb: hub: Fix error loop seen after hub  communication errors Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 006/134] ath9k_htc: Add new USB ID Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 019/134] cdc-acm: fix possible invalid access when  processing notification Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 014/134] mtd: nand: fsmc: fix NAND width handling Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 007/134] ath9k_htc: Add support of AirTies 1eda:2315  AR9271 device Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:10 +0200
  [PATCH 3.16 002/134] staging: comedi: jr3_pci: fix possible null  pointer dereference Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 16:20 +0200
  Re: [PATCH 3.16 000/134] 3.16.47-rc1 review Guenter Roeck <linux@roeck-us.net> - 2017-08-18 17:00 +0200
    Re: [PATCH 3.16 000/134] 3.16.47-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2017-08-18 22:20 +0200

csiph-web