From patchwork Tue Sep 26 15:05:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 818705 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="dLmZh5et"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y1kmY0lSDz9t1G for ; Wed, 27 Sep 2017 01:06:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031189AbdIZPFw (ORCPT ); Tue, 26 Sep 2017 11:05:52 -0400 Received: from mail-wr0-f180.google.com ([209.85.128.180]:50508 "EHLO mail-wr0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031180AbdIZPFu (ORCPT ); Tue, 26 Sep 2017 11:05:50 -0400 Received: by mail-wr0-f180.google.com with SMTP id w12so13492052wrc.7 for ; Tue, 26 Sep 2017 08:05:49 -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=G/5H8oGt2DglQ+uPyiCincsg3DYvYO+Es1OrKQvZ6ro=; b=dLmZh5etTkVUKAS3qtZSPvQxjpULwZ8IU0Yuf0LYXB9ngyGrA7fbRQ+6/6y/e0eoh/ iR9+4aqJcNijqGVLJRRlvOYKBVtjl2K0fFUN/vllSDpOTU+zmx900Xx3/qJAZXq1Xjah bt9Yc3zGmtHLNED5ZHonba/RJcPmdiHbo+Rnp7Orz9HXYt2/gL7nLycvr1V//vVABVX4 EY4Ynp079EFgq85TEGrD0gIzpF18v4+BgEf4YY7qcV+56/LMQzakaq7+mda1wJE9nbEm tVrIa/43Wt0HLQFZyeA4oxC6lit/1dJVN89y5RmmbgEKMOWqjVL5NgKducBQr8yi/nxq 2GKA== 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=G/5H8oGt2DglQ+uPyiCincsg3DYvYO+Es1OrKQvZ6ro=; b=ghV1BMY+CW59t4RFEFf2KUiEXv2q3RFNso1lsXjiN8r7nnpC+VTGa8mM9k1WqzSDqY GoRe/65aiyWA9lCpLxw76/mJDUGLWzqfOEfjkOKcrLcPmBT8/aPEy4eMyopxIJXgYJez sy5sf3ki37IvTB2JitayuMpQcZcS2rj2qIRLMQHn5ly73mKdaDCaOC6n5MNUVblkx0Qm 8lbwxE/XdL0YRzZWHUDqW7mZxjNIQ8A/pJFOsl3iifndjzvNEvC6rZ+svoFEetxpf+YV pMztRoP91Cc//5lqul0XVJ3MuTm7iYsdFV82vYNU0OY89bAeVfYcuVGkomeI27JvPGOH aUFQ== X-Gm-Message-State: AHPjjUiKFaC1HKgT71UQU5xoOXBk4AUzuUyjSo3P3NIPD25YejDhQIkM i3yAtdv8lznLulNxl06ExtQyUQ== X-Google-Smtp-Source: AOwi7QDgICGb7VOcuNzqyS6dNOQXoYS+OKYIpPWMVyKUTWB7IfUfjQP6iwPP0Nvr08tlIUFOjOmYTA== X-Received: by 10.223.133.218 with SMTP id 26mr7439536wru.26.1506438348776; Tue, 26 Sep 2017 08:05:48 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:f560:cb15:a6fe:5f28]) by smtp.gmail.com with ESMTPSA id 193sm3143165wmh.47.2017.09.26.08.05.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Sep 2017 08:05:48 -0700 (PDT) Received: by andreyknvl0.muc.corp.google.com (Postfix, from userid 206546) id DE75A180841; Tue, 26 Sep 2017 17:05:46 +0200 (CEST) From: Andrey Konovalov To: Christian Lamparter , Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Vyukov , Kostya Serebryany , Andrey Konovalov Subject: [PATCH] p54: don't unregister leds when they are inited Date: Tue, 26 Sep 2017 17:05:39 +0200 Message-Id: <384966f3a79915b4617d808c40e63072aa8b868d.1506438160.git.andreyknvl@google.com> X-Mailer: git-send-email 2.14.1.821.g8fa685d3b7-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ieee80211_register_hw() in p54_register_common() may fail and leds won't get initialized. Currently p54_unregister_common() doesn't check that and always calls p54_unregister_leds(). The fix is to check priv->registered flag before calling p54_unregister_leds(). Found by syzkaller. INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. CPU: 1 PID: 1404 Comm: kworker/1:1 Not tainted 4.14.0-rc1-42251-gebb2c2437d80-dirty #205 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Workqueue: usb_hub_wq hub_event Call Trace: __dump_stack lib/dump_stack.c:16 dump_stack+0x292/0x395 lib/dump_stack.c:52 register_lock_class+0x6c4/0x1a00 kernel/locking/lockdep.c:769 __lock_acquire+0x27e/0x4550 kernel/locking/lockdep.c:3385 lock_acquire+0x259/0x620 kernel/locking/lockdep.c:4002 flush_work+0xf0/0x8c0 kernel/workqueue.c:2886 __cancel_work_timer+0x51d/0x870 kernel/workqueue.c:2961 cancel_delayed_work_sync+0x1f/0x30 kernel/workqueue.c:3081 p54_unregister_leds+0x6c/0xc0 drivers/net/wireless/intersil/p54/led.c:160 p54_unregister_common+0x3d/0xb0 drivers/net/wireless/intersil/p54/main.c:856 p54u_disconnect+0x86/0x120 drivers/net/wireless/intersil/p54/p54usb.c:1073 usb_unbind_interface+0x21c/0xa90 drivers/usb/core/driver.c:423 __device_release_driver drivers/base/dd.c:861 device_release_driver_internal+0x4f4/0x5c0 drivers/base/dd.c:893 device_release_driver+0x1e/0x30 drivers/base/dd.c:918 bus_remove_device+0x2f4/0x4b0 drivers/base/bus.c:565 device_del+0x5c4/0xab0 drivers/base/core.c:1985 usb_disable_device+0x1e9/0x680 drivers/usb/core/message.c:1170 usb_disconnect+0x260/0x7a0 drivers/usb/core/hub.c:2124 hub_port_connect drivers/usb/core/hub.c:4754 hub_port_connect_change drivers/usb/core/hub.c:5009 port_event drivers/usb/core/hub.c:5115 hub_event+0x1318/0x3740 drivers/usb/core/hub.c:5195 process_one_work+0xc7f/0x1db0 kernel/workqueue.c:2119 process_scheduled_works kernel/workqueue.c:2179 worker_thread+0xb2b/0x1850 kernel/workqueue.c:2255 kthread+0x3a1/0x470 kernel/kthread.c:231 ret_from_fork+0x2a/0x40 arch/x86/entry/entry_64.S:431 Signed-off-by: Andrey Konovalov --- drivers/net/wireless/intersil/p54/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intersil/p54/main.c b/drivers/net/wireless/intersil/p54/main.c index d5a3bf91a03e..ab6d39e12069 100644 --- a/drivers/net/wireless/intersil/p54/main.c +++ b/drivers/net/wireless/intersil/p54/main.c @@ -852,12 +852,11 @@ void p54_unregister_common(struct ieee80211_hw *dev) { struct p54_common *priv = dev->priv; -#ifdef CONFIG_P54_LEDS - p54_unregister_leds(priv); -#endif /* CONFIG_P54_LEDS */ - if (priv->registered) { priv->registered = false; +#ifdef CONFIG_P54_LEDS + p54_unregister_leds(priv); +#endif /* CONFIG_P54_LEDS */ ieee80211_unregister_hw(dev); }