From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

Date: Tue, 14 Feb 2023 12:10:48 +0200

Subject: [PATCH] wifi: mac80211: Don't translate MLD addresses for multicast

References: bsc#1012628

Patch-mainline: 6.2.3

Git-commit: daf8fb4295dccc032515cdc1bd3873370063542b

[ Upstream commit daf8fb4295dccc032515cdc1bd3873370063542b ]

MLD address translation should be done only for individually addressed

frames. Otherwise, AAD calculation would be wrong and the decryption

would fail.

Fixes: e66b7920aa5ac ("wifi: mac80211: fix initialization of rx->link and rx->link_sta")

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

Link: https://lore.kernel.org/r/20230214101048.792414-1-andrei.otcheretianski@intel.com

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

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 net/mac80211/rx.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c

index 3c4541ee..870b8d04 100644

--- a/net/mac80211/rx.c

+++ b/net/mac80211/rx.c

@@ -4840,7 +4840,8 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,

 		hdr = (struct ieee80211_hdr *)rx->skb->data;

 	}

-	if (unlikely(rx->sta && rx->sta->sta.mlo)) {

+	if (unlikely(rx->sta && rx->sta->sta.mlo) &&

+	    is_unicast_ether_addr(hdr->addr1)) {

 		/* translate to MLD addresses */

 		if (ether_addr_equal(link->conf->addr, hdr->addr1))

 			ether_addr_copy(hdr->addr1, rx->sdata->vif.addr);

-- 

2.35.3