From patchwork Tue Nov 22 09:11:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: shaozhengchao X-Patchwork-Id: 13052069 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C78CBC43219 for ; Tue, 22 Nov 2022 09:05:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233060AbiKVJFe (ORCPT ); Tue, 22 Nov 2022 04:05:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232986AbiKVJFd (ORCPT ); Tue, 22 Nov 2022 04:05:33 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3AFED2D2; Tue, 22 Nov 2022 01:05:31 -0800 (PST) Received: from dggpeml500026.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NGdXg6h3lzqScN; Tue, 22 Nov 2022 17:01:23 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 22 Nov 2022 17:05:17 +0800 From: Zhengchao Shao To: , , , , , , CC: , , , , Subject: [PATCH] wifi: mac80211: fix memory leak in ieee80211_register_hw() Date: Tue, 22 Nov 2022 17:11:42 +0800 Message-ID: <20221122091142.261354-1-shaozhengchao@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500026.china.huawei.com (7.185.36.106) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When ieee80211_init_rate_ctrl_alg() failed in ieee80211_register_hw(), it doesn't release local->fq. The memory leakage information is as follows: unreferenced object 0xffff888109cad400 (size 512): comm "insmod", pid 15145, jiffies 4295005736 (age 3670.100s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000d1eb4a9f>] __kmalloc+0x3e/0xb0 [<00000000befc3e34>] ieee80211_txq_setup_flows+0x1fe/0xa10 [<00000000b13f1457>] ieee80211_register_hw+0x1b64/0x3950 [<00000000ba9f4e99>] 0xffffffffa02214db [<00000000833435c0>] 0xffffffffa024048d [<00000000a4ddd6ef>] do_one_initcall+0x10f/0x630 [<0000000068f29e16>] do_init_module+0x19f/0x5e0 [<00000000f52609b6>] load_module+0x64b7/0x6eb0 [<00000000b628a5b3>] __do_sys_finit_module+0x140/0x200 [<00000000c7f35d15>] do_syscall_64+0x35/0x80 [<0000000044d8d0fd>] entry_SYSCALL_64_after_hwframe+0x46/0xb0 Fixes: a50e5fb8db83 ("mac80211: fix a kernel panic when TXing after TXQ teardown") Signed-off-by: Zhengchao Shao --- net/mac80211/iface.c | 2 -- net/mac80211/main.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 46f08ec5ed76..cec6dd577241 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -2326,8 +2326,6 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local) WARN(local->open_count, "%s: open count remains %d\n", wiphy_name(local->hw.wiphy), local->open_count); - ieee80211_txq_teardown_flows(local); - mutex_lock(&local->iflist_mtx); list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { list_del(&sdata->list); diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 02b5abc7326b..b6620c5fd9e0 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1435,6 +1435,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ieee80211_remove_interfaces(local); rtnl_unlock(); fail_rate: + ieee80211_txq_teardown_flows(local); fail_flows: ieee80211_led_exit(local); destroy_workqueue(local->workqueue); @@ -1469,6 +1470,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) * because the driver cannot be handing us frames any * more and the tasklet is killed. */ + ieee80211_txq_teardown_flows(local); ieee80211_remove_interfaces(local); rtnl_unlock();