From mboxrd@z Thu Jan 1 00:00:00 1970 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 5F3AFC43334 for ; Wed, 20 Jul 2022 01:26:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242007AbiGTBZ6 (ORCPT ); Tue, 19 Jul 2022 21:25:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242354AbiGTBZB (ORCPT ); Tue, 19 Jul 2022 21:25:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E44C2743EC; Tue, 19 Jul 2022 18:17:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7B263616F6; Wed, 20 Jul 2022 01:17:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94BF0C341C6; Wed, 20 Jul 2022 01:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1658279872; bh=csDc6vGOsv3hNnFMLo10fyPonQpYIkuELcqoUiBKk3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iq9HW4xgxFaRe0UNTLjJj86ZSL2H4jKAU92wIA0+arbwOt4FjIRypuuYSdPkfyOas 2zO7rTQgN9E/uNndpavU3Okk2CtmYw0p2rUoqTkalOENFNf0+atCKylw9GcJ0ete7i tNYaxDXazGyLgaPCxgzS9GWgxBduqwLNGoa57VLd09JI4jePyF3QJfZJU1qvu6vDBt iOmPcUN0Hu3QsrQ5GqAW1bbwfqvdlYUmJnlaDUOq8NC/eUhXQoQBGZz7nlBrkZKhqy Ewwck6lFGomm4Z5f1JkXCjqg3UDaqnSFeT7mzCIW5QPm0PzKx4JhMuBXF2D1Q7V6Lv u+aapAfJcWhFw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Fietkau , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Johannes Berg , Sasha Levin , johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 06/16] wifi: mac80211: do not wake queues on a vif that is being stopped Date: Tue, 19 Jul 2022 21:17:20 -0400 Message-Id: <20220720011730.1025099-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220720011730.1025099-1-sashal@kernel.org> References: <20220720011730.1025099-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Felix Fietkau [ Upstream commit f856373e2f31ffd340e47e2b00027bd4070f74b3 ] When a vif is being removed and sdata->bss is cleared, __ieee80211_wake_txqs can still be called on it, which crashes as soon as sdata->bss is being dereferenced. To fix this properly, check for SDATA_STATE_RUNNING before waking queues, and take the fq lock when setting it (to ensure that __ieee80211_wake_txqs observes the change when running on a different CPU) Signed-off-by: Felix Fietkau Acked-by: Toke Høiland-Jørgensen Link: https://lore.kernel.org/r/20220531190824.60019-1-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/iface.c | 2 ++ net/mac80211/util.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index ddc001ad9055..48bda8aaa90a 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -803,7 +803,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool cancel_scan; struct cfg80211_nan_func *func; + spin_lock_bh(&local->fq.lock); clear_bit(SDATA_STATE_RUNNING, &sdata->state); + spin_unlock_bh(&local->fq.lock); cancel_scan = rcu_access_pointer(local->scan_sdata) == sdata; if (cancel_scan) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index c1c117fdf318..8ae0186091b6 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -250,6 +250,9 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac) local_bh_disable(); spin_lock(&fq->lock); + if (!test_bit(SDATA_STATE_RUNNING, &sdata->state)) + goto out; + if (sdata->vif.type == NL80211_IFTYPE_AP) ps = &sdata->bss->ps; -- 2.35.1