From patchwork Thu Aug 20 15:58:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1348466 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=ZoG5qIRy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BXTrY5hK7z9sRN for ; Fri, 21 Aug 2020 02:00:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729635AbgHTQA3 (ORCPT ); Thu, 20 Aug 2020 12:00:29 -0400 Received: from mail-bn7nam10on2087.outbound.protection.outlook.com ([40.107.92.87]:47585 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729535AbgHTQAD (ORCPT ); Thu, 20 Aug 2020 12:00:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QxrL4hgL45qbgvs9EOLMyPncQtu6VCIJdMv5pqYKGZfyLLF3W0z9o0wPYYKFBdT8jaKYwRVulFnaDlZVnFgmqdSLOVGwcLtN0t+N8VeCBitPsyXSVfK3//i4yQUViH+rN+CESWS0ZuQE2DxoAf9e0uUU8MW/mjRIUEWfdKpVYU/7ihhyR9eTbDp7UYSnTXzhmRj/633RZXh/+sTkCyCOvzqhsh6Dxj7cofW7q0+BUct3POqKDGKumXjScFKAXexNl63a9YA5GGKaloUC1/EKhcMPGaHKL+TbE/LI94uCNoApCDqcbi5bmBoaBSC2wIqP6ftSGDXPywBOfBZYnSlkvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OeIL0It1fFIeWFpLR4Qcd4WkB9/MzX2laSvSJn+wd8A=; b=G0cmcUAGP4G9peWf9Yt0dgeAqYXQauAH9EtJO6he56iM/klsuGtHwpllWXYGL84Ot1U3EYQdJGCEWdZPDleqEAJt8JvSRz5XVPMbc5NT95knQILDPJJC2262JUrlcnhGFWzSl3YDCTXh0v30gJVR5qLMHJQz5i1Mb5uG+wf35JdIc9o/AiXNHW0F49ZIyUIvXlMgR25ei90ohjwRaWJrumevmrKVmhzSCFTf1NqrB8LJRqhcfsoDdvCuMLpd/9a2SJUYtX1Z958LXwP7IbAqV7If+Xfs073+76PUc33RuSbPXnjdynCadzJd+yMpbcDZ1e7WooSxSxSmw81yRnrIYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OeIL0It1fFIeWFpLR4Qcd4WkB9/MzX2laSvSJn+wd8A=; b=ZoG5qIRyUvuqPBNJ48PNtxQrj4/61t5O6lllsb0at0QBo4AuWF5p1Os1U4ZIOYNQjBgIEWHQPBa4OsWusEahPFvjL6BAaO1Bxx29AKqaWZq87IR8emLtYzXwMIceTUULiFGWaEbpZRVDQYpt29UAV45BeEeeS/o7yI271vXXSJQ= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none;driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) by SA0PR11MB4541.namprd11.prod.outlook.com (2603:10b6:806:94::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Thu, 20 Aug 2020 15:59:35 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::85c9:1aa9:aeab:3fa6]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::85c9:1aa9:aeab:3fa6%4]) with mapi id 15.20.3305.026; Thu, 20 Aug 2020 15:59:35 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 08/12] staging: wfx: fix potential use before init Date: Thu, 20 Aug 2020 17:58:54 +0200 Message-Id: <20200820155858.351292-8-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820155858.351292-1-Jerome.Pouiller@silabs.com> References: <20200820155858.351292-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0122.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::14) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from 255.255.255.255 (255.255.255.255) by PR0P264CA0122.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24 via Frontend Transport; Thu, 20 Aug 2020 15:59:33 +0000 X-Mailer: git-send-email 2.28.0 X-Originating-IP: [37.71.187.125] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01a56d60-64f4-45e6-aa07-08d8452208a6 X-MS-TrafficTypeDiagnostic: SA0PR11MB4541: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l4KfWxHZhMzVfoMdnLF67OIXFZXOlWlaY3uY0PmN+Y5H+l6jPC6F2OS7kEuDy32b6+2qRcz0aMAerh8IWgx3gzWu/+bIrgtMGZxr7ykes++ZJS8DJyvkL5xEvC/gXsREuDkRknGRKpwButbMrA2YA6xF6Hy1pbg7VU8xoQsruR2HOOuQcmwyoXNb5p9pwSUeB9FufdhoVAoRQdYg2iB6yf9qq7cgP/RG52zmdXx1L+WmvTRC4j0DNjEVOcnLbUfH2GG/oGqd3yKOQ+eZLWU6C0NJ54EehBeu1em7edeOm0mkKM9XSq8LDoWbqCcUb89r8CR38W5n105x75Fxboml4rbKeHk3x6FaFmW+jkyL59GGU0P6HD+2uAt7bPRSUHZj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB2718.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(396003)(39850400004)(366004)(346002)(136003)(186003)(6666004)(2906002)(8676002)(316002)(16576012)(54906003)(956004)(26005)(66574015)(8936002)(2616005)(110011004)(52116002)(83380400001)(107886003)(1076003)(5660300002)(478600001)(36756003)(4326008)(66476007)(66556008)(66946007)(86362001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: mz39n78xERVLVUrtAOzIwduDGFIRCXLE3Bm1K/u4odlbWq9V1BgE+birwAo3OCmJypwX1NNjriHlBLK7+37BNgNq2uniQM0AFFiNDKlt+v4jBifzwfB3RYqmuzkjdipbjBMk/OPKO4W3+GMFeg5zd+ZYG1sjP37yEuz0mOgXVKlAnDcie7Xt0N205bgw4CUVnByo1lxzlYn49BT+34M3biRrDnXSGznAkqcQ3r7bufVs3o94+Inp1fY1dazSegg9c6yPftcH2skfg1rFh9nyrogwdQRjnHqbBbWrqWXCTM+7GGLayNxQNmTJXTN9tM1EE6Cncnk0aV+kaYsE5/wplDsMD45HS90Ny1uYzZEHwPkIEGyuaNNbaCGINkGG2ZN9d9/nDwGA9Pyf5I19kpJBdMYP3FHuJHNWyFV+tS8kZrjx02Yg+xhXlyRC+i3lLhkV57cKYDvyN+PbRrxC+TqrcETj/lJJ8MopMBYxrnJQEsaasiqt7xSuTT0HlnAQz0lCbbrpyP6P4As4hj7N1b5azLTbkBjNANRK5fMFFGUnVKGclLgYUOOuUQPBw/lHqgKrU5mF+bZ0dgKeoQAzOfRpotFRv0m5rJH5ZIaff+p5XvJ0CvhQb5TqGVJ7Fad/wgvnsZ1+bv58GXoCqLTI6H1fng== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01a56d60-64f4-45e6-aa07-08d8452208a6 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2020 15:59:35.0999 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sNmOKkbCdE+ra+q3ugRWFNYmZvc25LlKXzxgXLpezZsAwq7h/vj6Fh9d3HorKSEIxR6ptuOg2m58XJmaRcGM4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4541 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The trace below can appear: [83613.832200] INFO: trying to register non-static key. [83613.837248] the code is fine but needs lockdep annotation. [83613.842808] turning off the locking correctness validator. [83613.848375] CPU: 3 PID: 141 Comm: kworker/3:2H Tainted: G O 5.6.13-silabs15 #2 [83613.857019] Hardware name: BCM2835 [83613.860605] Workqueue: events_highpri bh_work [wfx] [83613.865552] Backtrace: [83613.868041] [] (dump_backtrace) from [] (show_stack+0x20/0x24) [83613.881463] [] (show_stack) from [] (dump_stack+0xe8/0x114) [83613.888882] [] (dump_stack) from [] (register_lock_class+0x748/0x768) [83613.905035] [] (register_lock_class) from [] (__lock_acquire+0x88/0x13dc) [83613.924192] [] (__lock_acquire) from [] (lock_acquire+0xe8/0x274) [83613.942644] [] (lock_acquire) from [] (_raw_spin_lock_irqsave+0x58/0x6c) [83613.961714] [] (_raw_spin_lock_irqsave) from [] (skb_dequeue+0x24/0x78) [83613.974967] [] (skb_dequeue) from [] (wfx_tx_queues_get+0x96c/0x1294 [wfx]) [83613.989728] [] (wfx_tx_queues_get [wfx]) from [] (bh_work+0x454/0x26d8 [wfx]) [83614.009337] [] (bh_work [wfx]) from [] (process_one_work+0x23c/0x7ec) [83614.028141] [] (process_one_work) from [] (worker_thread+0x4c/0x55c) [83614.046861] [] (worker_thread) from [] (kthread+0x138/0x168) [83614.064876] [] (kthread) from [] (ret_from_fork+0x14/0x20) [83614.072200] Exception stack(0xecad3fb0 to 0xecad3ff8) [83614.077323] 3fa0: 00000000 00000000 00000000 00000000 [83614.085620] 3fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [83614.093914] 3fe0: 00000000 00000000 00000000 00000000 00000013 00000000 Indeed, the code of wfx_add_interface() shows that the interface is enabled to early. So, the spinlock associated with some skb_queue may not yet initialized when wfx_tx_queues_get() is called. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/sta.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index b18a0b61b7c0..9b760fb574f8 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -753,17 +753,6 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) return -EOPNOTSUPP; } - for (i = 0; i < ARRAY_SIZE(wdev->vif); i++) { - if (!wdev->vif[i]) { - wdev->vif[i] = vif; - wvif->id = i; - break; - } - } - if (i == ARRAY_SIZE(wdev->vif)) { - mutex_unlock(&wdev->conf_mutex); - return -EOPNOTSUPP; - } // FIXME: prefer use of container_of() to get vif wvif->vif = vif; wvif->wdev = wdev; @@ -780,12 +769,22 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) init_completion(&wvif->scan_complete); INIT_WORK(&wvif->scan_work, wfx_hw_scan_work); - mutex_unlock(&wdev->conf_mutex); - - hif_set_macaddr(wvif, vif->addr); - wfx_tx_queues_init(wvif); wfx_tx_policy_init(wvif); + + for (i = 0; i < ARRAY_SIZE(wdev->vif); i++) { + if (!wdev->vif[i]) { + wdev->vif[i] = vif; + wvif->id = i; + break; + } + } + WARN(i == ARRAY_SIZE(wdev->vif), "try to instantiate more vif than supported"); + + hif_set_macaddr(wvif, vif->addr); + + mutex_unlock(&wdev->conf_mutex); + wvif = NULL; while ((wvif = wvif_iterate(wdev, wvif)) != NULL) { // Combo mode does not support Block Acks. We can re-enable them @@ -817,6 +816,7 @@ void wfx_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) wvif->vif = NULL; mutex_unlock(&wdev->conf_mutex); + wvif = NULL; while ((wvif = wvif_iterate(wdev, wvif)) != NULL) { // Combo mode does not support Block Acks. We can re-enable them