From patchwork Thu Nov 2 20:26:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 833538 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="lH76YQaI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ySc8G53lyz9sPm for ; Fri, 3 Nov 2017 07:27:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934444AbdKBU1S (ORCPT ); Thu, 2 Nov 2017 16:27:18 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:49157 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934336AbdKBU1I (ORCPT ); Thu, 2 Nov 2017 16:27:08 -0400 Received: by mail-wm0-f68.google.com with SMTP id b189so1271500wmd.4 for ; Thu, 02 Nov 2017 13:27:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6tZvBzRaWAqJ02Qd9KCyELVX1PVR9CuFci4VPiN5z1c=; b=lH76YQaICJoqvPAu1p8TG3sJ3QUs1M2qN5ftoL31UdDuF+VPEUIew3GzdSElXfPwVC hUSKUOAOPJ+zQNOq6OPs7wZ02c1FZKqFD1upzQY44O9ryfmcV9xJI1qti1w+cL7GAjTl wfGaqyzizIhCCM5u4zxTaHzvr9p3+55AE2JNqq+84yJNtQeo69BdrXAPJbAuylyQ6qhZ m3w+bGVuy2fmxvkvZEr95edO0PlcbF4OzMqXgANLx6FkK4YzGz4grSwKcaKanGpmzIK3 7VDDIDVLFNZvsyy+nTfPQe+pr6dD7uT/ELSCWZMCZGn4bxaz5DmBufZaCQXBrGCPIN9e vQ+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6tZvBzRaWAqJ02Qd9KCyELVX1PVR9CuFci4VPiN5z1c=; b=ek1VreHKbI/RFw9VJrQdjYz/wbbeyM0sAPzuuixX1KPb8a7sGA1p8KJGaq6sR2BJUR GrFiVwVy/ZLdatNEvUsbjWHYulEauaBjqMaNaPLAuDfUzHxRtvqrVUlqR3Oi6l+r8jvA uRJ0lg+tcgMQ112Nan5sAeYJP7fBHCS2X/E4ceu7KQqPSsi2PHGcJRTEfy0ZdWW5qmFE 4JkxjkwoW9tehRnKnvrPwZRaBq9JfipnrqM2iB2KCYgh/rTN7Q7nPcMqdJKFaXSOLn6P fCtF/2ABfA60K4tpDXr2eN5+P2MskoFUd45PdWw5zVy/uxQLKY23WAXc+/v6elywF/qz kMXw== X-Gm-Message-State: AMCzsaUZZZvEHrEQSfPerRcQzIHhDOm9IqKZqNz4Y70EZIbvj23PNfwS UVuTPdFY/15+/RboNmmxY1T13Q== X-Google-Smtp-Source: ABhQp+SWpaEzPcD/mJULcvUKwG9u3tARbFm+TQgj08NQ5aaSW52sF70nfFbcNEpXf8buPKWAo7iCXw== X-Received: by 10.28.125.139 with SMTP id y133mr2735401wmc.25.1509654426979; Thu, 02 Nov 2017 13:27:06 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([100.105.28.157]) by smtp.gmail.com with ESMTPSA id x73sm448489wme.34.2017.11.02.13.27.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 13:27:06 -0700 (PDT) Received: by andreyknvl0.muc.corp.google.com (Postfix, from userid 206546) id 3EC6A180ADF; Thu, 2 Nov 2017 21:27:05 +0100 (CET) From: Andrey Konovalov To: "David S . Miller" , Dean Jenkins , allan , Andrey Konovalov , Peter Chen , Philippe Reynes , Greg Ungerer , Colin Ian King , linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Vyukov , Kostya Serebryany Subject: [PATCH] net: usb: asix: fill null-ptr-deref in asix_suspend Date: Thu, 2 Nov 2017 21:26:59 +0100 Message-Id: <9e768a837391af216cf1d2c8ac08af41f28cb147.1509654127.git.andreyknvl@google.com> X-Mailer: git-send-email 2.15.0.403.gc27cc4dac6-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. 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 --- drivers/net/usb/asix_devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index b2ff88e69a81..743416be84f3 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);