From patchwork Tue Feb 14 10:10:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 13139802 X-Patchwork-Delegate: johannes@sipsolutions.net 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 0F040C05027 for ; Tue, 14 Feb 2023 10:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231575AbjBNKLM (ORCPT ); Tue, 14 Feb 2023 05:11:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231723AbjBNKLC (ORCPT ); Tue, 14 Feb 2023 05:11:02 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BE82115 for ; Tue, 14 Feb 2023 02:11:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676369461; x=1707905461; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=CABN2CPWBnimV4fRCxHovFa8yLClii5Oq51tMdcdNqE=; b=MUOzPKaD2RCEkgrFGv6ntxx5l+g/7QMhLb+Uj+3rps55I061As1e95Gc //MKIOAxz89UG0Wi7PKs2ni2f4N50ayQUUJ6IpCL0ult0r22Ras6QkcfU qjsdgekmlWADVGKfyN6q+2fGkknC8grLdcUTjyGfxn59w3BvDW7qapzTI TB5Zof5XecLiGx/BEpiBr47r3cRg2ZuIQJ8QuUKqmBaL+9VM06mDnIyri aZQc1mWIG862UoVXFhA96Uer48irgaV1JWv2uAUXB9CYcExDF3WHp54Zm okcbu/FtMmMahlafgtXVxhTVSM6fwnu+h6B8UcGkTUroUl9L5QI0u4jg1 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10620"; a="393529574" X-IronPort-AV: E=Sophos;i="5.97,296,1669104000"; d="scan'208";a="393529574" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2023 02:11:00 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10620"; a="998024518" X-IronPort-AV: E=Sophos;i="5.97,296,1669104000"; d="scan'208";a="998024518" Received: from allangfe-mobl2.amr.corp.intel.com (HELO aotchere-desk.intel.com) ([10.255.194.53]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2023 02:10:59 -0800 From: Andrei Otcheretianski To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Andrei Otcheretianski Subject: [PATCH] wifi: mac80211: Don't translate MLD addresses for multicast Date: Tue, 14 Feb 2023 12:10:48 +0200 Message-Id: <20230214101048.792414-1-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 --- 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 e284897ba5e9..b32206ae32b8 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -4843,7 +4843,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);