From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF25A1FE45D; Mon, 17 Mar 2025 16:38:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742229510; cv=none; b=h3FAWskd7Off4YLP3O4cbCH52Iyxh8P2u8mRuwuD/iDG0sa8QUsXFUqOzNRvV6OWTKlZPj6Ia4uKIqDf3lkPRucfG9ubxfUbbY+x07TbUKIXlMCzWDiLLr4thDw26I0DzMF60hFa6V9KNJ5JAcob5A2/bMHevwkmbuZIuQX9seo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742229510; c=relaxed/simple; bh=/8meWmzTZbw5wi5wMvYrEgCMGPK9ybmFo2OU+vVu32k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KH1W7qT09qSiLJzY/F7IFVyZp5SLM/kVY54yFOg/Ai8V67g2IPzAsNkcg42Za9ikczrXpjoy39SnPIC/BoYOfgRyKb3xUZMw/gjjUoXXpL8I43fgUhBQ6UXK2rOcWbyovtMxaTTIn07NY+FHcr+iZLkyZduYTTmBiqfGW3ZUTv0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I3sisvB1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I3sisvB1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21301C4CEE3; Mon, 17 Mar 2025 16:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742229509; bh=/8meWmzTZbw5wi5wMvYrEgCMGPK9ybmFo2OU+vVu32k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I3sisvB135s+jdoEc/M1KlNKspKC81IaBp75+wIJpsdn8bRXWP+b/FFBgBTX3i8nF Py7bmKraQqMU3koxr/5SyjOIGmDCNm9CTLbz3H/xVpYkmF3BbNjdT/g7o4CxkW04cB oJGsP4Uk9pe6i9VUvxT/T5gMtPOHf5+C68YZ2oMZbtmwgjDuYi/HhaRTQEISgXZ6cb qlNCbrCkQjTCvnERyaEYM+lX4i6ba8kiRWCkGO6NhQjgvi0J2drRi71sau8X0eDiBt QfQPUld765FZg5Gaxj4SunqXyNDLGv5IgoJm18Bc3BlU2JFmhflsToEKvnZQjWf6Cf i1pGloSGQR+3Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Emmanuel Grumbach , Johannes Berg , Miri Korenblit , Sasha Levin , johannes@sipsolutions.net, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 04/13] wifi: mac80211: flush the station before moving it to UN-AUTHORIZED state Date: Mon, 17 Mar 2025 12:38:09 -0400 Message-Id: <20250317163818.1893102-4-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317163818.1893102-1-sashal@kernel.org> References: <20250317163818.1893102-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.19 Content-Transfer-Encoding: 8bit From: Emmanuel Grumbach [ Upstream commit 43e04077170799d0e6289f3e928f727e401b3d79 ] We first want to flush the station to make sure we no longer have any frames being Tx by the station before the station is moved to un-authorized state. Failing to do that will lead to races: a frame may be sent after the station's state has been changed. Since the API clearly states that the driver can't fail the sta_state() transition down the list of state, we can easily flush the station first, and only then call the driver's sta_state(). Signed-off-by: Emmanuel Grumbach Reviewed-by: Johannes Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250306123626.450bc40e8b04.I636ba96843c77f13309c15c9fd6eb0c5a52a7976@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/sta_info.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index aa22f09e6d145..49095f19a0f22 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -4,7 +4,7 @@ * Copyright 2006-2007 Jiri Benc * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015 - 2017 Intel Deutschland GmbH - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation */ #include @@ -1317,9 +1317,13 @@ static int _sta_info_move_state(struct sta_info *sta, sta->sta.addr, new_state); /* notify the driver before the actual changes so it can - * fail the transition + * fail the transition if the state is increasing. + * The driver is required not to fail when the transition + * is decreasing the state, so first, do all the preparation + * work and only then, notify the driver. */ - if (test_sta_flag(sta, WLAN_STA_INSERTED)) { + if (new_state > sta->sta_state && + test_sta_flag(sta, WLAN_STA_INSERTED)) { int err = drv_sta_state(sta->local, sta->sdata, sta, sta->sta_state, new_state); if (err) @@ -1395,6 +1399,16 @@ static int _sta_info_move_state(struct sta_info *sta, break; } + if (new_state < sta->sta_state && + test_sta_flag(sta, WLAN_STA_INSERTED)) { + int err = drv_sta_state(sta->local, sta->sdata, sta, + sta->sta_state, new_state); + + WARN_ONCE(err, + "Driver is not allowed to fail if the sta_state is transitioning down the list: %d\n", + err); + } + sta->sta_state = new_state; return 0; -- 2.39.5