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 B10A23579F1; Mon, 5 May 2025 22:44:33 +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=1746485074; cv=none; b=rj2JSH3UOJuh7T19UF3A/WfYeq5vQw3FSTgEKlX/XneOon/hclzTBrjzBmZ3YpUOGpL/vT+uHoDEL5imYKrz2OQ2i5CXplOXtHvf47hmToehRRDiAmYU8zdyj4x2JUbZuhOOHzjfwwKC1SHL/axUpCurUPnesnGfGoWDi/JBE0w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485074; c=relaxed/simple; bh=5UYltFtK9fHPV7+8c5lZv+Yq4pxdhEUuN2aJzPU8pnA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jjesD4nmAGeg/LCEFmv2vl7fVRByGTPxQfEwPsp/c6ARy/hqVltiFwUWxr8ZA2LnDZrZEqpJyPmPreh4yjISqt3vCSUzPu0CWjPis4pWtoMMedjvFrggSbK92w7p1mUNvl5KyTzgKFWwd2Lh1Cg8GHPr7s8epGY629idMbuudZY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sDY+OE3D; 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="sDY+OE3D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44971C4CEFC; Mon, 5 May 2025 22:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485073; bh=5UYltFtK9fHPV7+8c5lZv+Yq4pxdhEUuN2aJzPU8pnA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sDY+OE3DotyCPCpJ+Valb0HjaPk+66UjNbg2xCTUAUeWR9JP92x3ENJtnzX2m4bfb +x+dwxTjIxLQX6befE7Xvaaj/78ehIJYIPlJ32GHh3NmHCDZjzqJRqKfEd0C5EXsxC FNvoKdc8lIfA2Sl0kKI/jrM2uweMkrUGxTEWLD2W8ZnXrd7zX4/hBLbNU5oEq27ljb ESz6vUWATJOeBnxDeWnjm3HmsGTVnrlaqQSPzq88Hx1xF57NbXX2k1+60NVNSMLUrr plrU3Gwwc9vr6iWVpgEo3B1aCAqVEFpUeQ5Sb71MnQn7t2Shg8olnuR9n1rO7/Irqo 1BA3aBDaZtqpQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Ilan Peer , Miri Korenblit , Sasha Levin , johannes@sipsolutions.net, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 152/486] wifi: mac80211: fix warning on disconnect during failed ML reconf Date: Mon, 5 May 2025 18:33:48 -0400 Message-Id: <20250505223922.2682012-152-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.26 Content-Transfer-Encoding: 8bit From: Johannes Berg [ Upstream commit 0e104aa3676d020f6c442cd7fbaeb72adaaab6fc ] If multi-link reconfiguration fails, we can disconnect with a local link already allocated but the BSS entry not assigned yet, which leads to a warning in cfg80211. Add a check to avoid the warning. Signed-off-by: Johannes Berg Reviewed-by: Ilan Peer Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250308225541.699bd9cbabe5.I599d5ff69092a65e916e2acd25137ae9df8debe8@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index ad0d040569dcd..f000026ab714a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -4033,7 +4033,7 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata) struct ieee80211_link_data *link; link = sdata_dereference(sdata->link[link_id], sdata); - if (!link) + if (!link || !link->conf->bss) continue; cfg80211_unlink_bss(local->hw.wiphy, link->conf->bss); link->conf->bss = NULL; -- 2.39.5