[linux] 04/06: net: usb: asix: fill null-ptr-deref in asix_suspend (CVE-2017-16647)

Thu Nov 16 18:16:43 UTC 2017

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 4ee0c56703668bedb74aa6037f8121cb62b37c01
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 16 18:11:00 2017 +0000

    net: usb: asix: fill null-ptr-deref in asix_suspend (CVE-2017-16647)
---
 debian/changelog                                   |  1 +
 ...-asix-fill-null-ptr-deref-in-asix_suspend.patch | 83 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 85 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 95350a2..2973a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -129,6 +129,7 @@ linux (4.13.13-1) UNRELEASED; urgency=medium
     (CVE-2017-16536)
   * media: imon: Fix null-ptr-deref in imon_probe (CVE-2017-16537)
   * media: dib0700: fix invalid dvb_detach argument (CVE-2017-16646)
+  * net: usb: asix: fill null-ptr-deref in asix_suspend (CVE-2017-16647)
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 04 Nov 2017 09:54:41 +0100
 
diff --git a/debian/patches/bugfix/all/net-usb-asix-fill-null-ptr-deref-in-asix_suspend.patch b/debian/patches/bugfix/all/net-usb-asix-fill-null-ptr-deref-in-asix_suspend.patch
new file mode 100644
index 0000000..758f34d
--- /dev/null
+++ b/debian/patches/bugfix/all/net-usb-asix-fill-null-ptr-deref-in-asix_suspend.patch
@@ -0,0 +1,83 @@
+From: Andrey Konovalov <andreyknvl at google.com>
+Date: Mon, 6 Nov 2017 13:26:46 +0100
+Subject: net: usb: asix: fill null-ptr-deref in asix_suspend
+Origin: https://git.kernel.org/linus/8f5624629105589bcc23d0e51cc01bd8103d09a5
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-16647
+
+When asix_suspend() is called dev->driver_priv might not have been
+assigned a value, so we need to check that it's not NULL.
+
+Similar issue is present in asix_resume(), this patch fixes it as well.
+
+Found by syzkaller.
+
+kasan: CONFIG_KASAN_INLINE enabled
+kasan: GPF could be caused by NULL-ptr deref or user memory access
+general protection fault: 0000 [#1] PREEMPT SMP KASAN
+Modules linked in:
+CPU: 0 PID: 24 Comm: kworker/0:1 Not tainted 4.14.0-rc4-43422-geccacdd69a8c #400
+Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
+Workqueue: usb_hub_wq hub_event
+task: ffff88006bb36300 task.stack: ffff88006bba8000
+RIP: 0010:asix_suspend+0x76/0xc0 drivers/net/usb/asix_devices.c:629
+RSP: 0018:ffff88006bbae718 EFLAGS: 00010202
+RAX: dffffc0000000000 RBX: ffff880061ba3b80 RCX: 1ffff1000c34d644
+RDX: 0000000000000001 RSI: 0000000000000402 RDI: 0000000000000008
+RBP: ffff88006bbae738 R08: 1ffff1000d775cad R09: 0000000000000000
+R10: 0000000000000000 R11: 0000000000000000 R12: ffff8800630a8b40
+R13: 0000000000000000 R14: 0000000000000402 R15: ffff880061ba3b80
+FS:  0000000000000000(0000) GS:ffff88006c600000(0000) knlGS:0000000000000000
+CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
+CR2: 00007ff33cf89000 CR3: 0000000061c0a000 CR4: 00000000000006f0
+Call Trace:
+ usb_suspend_interface drivers/usb/core/driver.c:1209
+ usb_suspend_both+0x27f/0x7e0 drivers/usb/core/driver.c:1314
+ usb_runtime_suspend+0x41/0x120 drivers/usb/core/driver.c:1852
+ __rpm_callback+0x339/0xb60 drivers/base/power/runtime.c:334
+ rpm_callback+0x106/0x220 drivers/base/power/runtime.c:461
+ rpm_suspend+0x465/0x1980 drivers/base/power/runtime.c:596
+ __pm_runtime_suspend+0x11e/0x230 drivers/base/power/runtime.c:1009
+ pm_runtime_put_sync_autosuspend ./include/linux/pm_runtime.h:251
+ usb_new_device+0xa37/0x1020 drivers/usb/core/hub.c:2487
+ hub_port_connect drivers/usb/core/hub.c:4903
+ hub_port_connect_change drivers/usb/core/hub.c:5009
+ port_event drivers/usb/core/hub.c:5115
+ hub_event+0x194d/0x3740 drivers/usb/core/hub.c:5195
+ process_one_work+0xc7f/0x1db0 kernel/workqueue.c:2119
+ worker_thread+0x221/0x1850 kernel/workqueue.c:2253
+ kthread+0x3a1/0x470 kernel/kthread.c:231
+ ret_from_fork+0x2a/0x40 arch/x86/entry/entry_64.S:431
+Code: 8d 7c 24 20 48 89 fa 48 c1 ea 03 80 3c 02 00 75 5b 48 b8 00 00
+00 00 00 fc ff df 4d 8b 6c 24 20 49 8d 7d 08 48 89 fa 48 c1 ea 03 <80>
+3c 02 00 75 34 4d 8b 6d 08 4d 85 ed 74 0b e8 26 2b 51 fd 4c
+RIP: asix_suspend+0x76/0xc0 RSP: ffff88006bbae718
+---[ end trace dfc4f5649284342c ]---
+
+Signed-off-by: Andrey Konovalov <andreyknvl at google.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/usb/asix_devices.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
+index b2ff88e69a81..3d4f7959dabb 100644
+--- a/drivers/net/usb/asix_devices.c
++++ b/drivers/net/usb/asix_devices.c
+@@ -626,7 +626,7 @@ static int asix_suspend(struct usb_interface *intf, pm_message_t message)
+ 	struct usbnet *dev = usb_get_intfdata(intf);
+ 	struct asix_common_private *priv = dev->driver_priv;
+ 
+-	if (priv->suspend)
++	if (priv && priv->suspend)
+ 		priv->suspend(dev);
+ 
+ 	return usbnet_suspend(intf, message);
+@@ -678,7 +678,7 @@ static int asix_resume(struct usb_interface *intf)
+ 	struct usbnet *dev = usb_get_intfdata(intf);
+ 	struct asix_common_private *priv = dev->driver_priv;
+ 
+-	if (priv->resume)
++	if (priv && priv->resume)
+ 		priv->resume(dev);
+ 
+ 	return usbnet_resume(intf);
diff --git a/debian/patches/series b/debian/patches/series
index 678c161..11f4def 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -121,6 +121,7 @@ bugfix/all/usb-usbtest-fix-NULL-pointer-dereference.patch
 bugfix/all/media-cx231xx-cards-fix-null-deref-on-missing-associ.patch
 bugfix/all/media-imon-fix-null-ptr-deref-in-imon_probe.patch
 bugfix/all/media-dib0700-fix-invalid-dvb_detach-argument.patch
+bugfix/all/net-usb-asix-fill-null-ptr-deref-in-asix_suspend.patch
 
 # Fix exported symbol versions
 bugfix/alpha/alpha-restore-symbol-versions-for-symbols-exported-f.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git

