From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 15 Feb 2023 09:40:41 +0000 (+0100)
Subject: wifi: mac80211: always initialize link_sta with sta
X-Git-Tag: v6.3-rc1~162^2~39^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab5f171e36063b33aba1dd4c7c6d5031b00b42aa;p=thirdparty%2Fkernel%2Flinux.git

wifi: mac80211: always initialize link_sta with sta

When we have multiple interfaces receiving the same frame,
such as a multicast frame, one interface might have a sta
and the other not. In this case, link_sta would be set but
not cleared again.

Always set link_sta, so we keep an invariant that link_sta
and sta are either both set or both not set.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 69aa623163c6d..f7fdfe710951f 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4125,6 +4125,8 @@ static bool ieee80211_rx_data_set_sta(struct ieee80211_rx_data *rx,
 		if (!rx->sdata)
 			rx->sdata = sta->sdata;
 		rx->link_sta = &sta->deflink;
+	} else {
+		rx->link_sta = NULL;
 	}
 
 	if (link_id < 0)