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 A34B616422 for ; Fri, 8 Sep 2023 18:19:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29BDEC4339A; Fri, 8 Sep 2023 18:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694197149; bh=KbOkRZBJWdPdvM1++c8dlbDo15VKmvAQvE2M+aTA8Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=csA/El9QbffXUTIFnAhPcJAQTBo8IF7vgHCFf9+ENSze2GzFaG4eoOVa2QRKaK7wg zf0XaIvr6BDQTc7xLgINW6ZDcmvcl+KnZAygJ2tDbCqdJwr2esN8DHy57U4ADBZIB5 GdDeNKq+HQt/yrcHBbBMqOnimV9kJwcP1oNbSZRlMf2WJLlMk2VPvzvFgydO6O3itK WyS9R8XDUIZcXsbndNPhRXLt/C3ecxXBpjIULURn92z70PuQRtwXm18tapkSfWZMsF LrxwR3q0yyIdznLMVCLTvfVJtxjysy/FeC1qI1lGmrEYUlTqT5Spcaxn4xiyW+GLc9 lMdrSSfikSKGQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , syzbot+2676771ed06a6df166ad@syzkaller.appspotmail.com, Sasha Levin , johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 21/26] wifi: cfg80211: reject auth/assoc to AP with our address Date: Fri, 8 Sep 2023 14:17:59 -0400 Message-Id: <20230908181806.3460164-21-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908181806.3460164-1-sashal@kernel.org> References: <20230908181806.3460164-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@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.1.52 Content-Transfer-Encoding: 8bit From: Johannes Berg [ Upstream commit 5d4e04bf3a0f098bd9033de3a5291810fa14c7a6 ] If the AP uses our own address as its MLD address or BSSID, then clearly something's wrong. Reject such connections so we don't try and fail later. Reported-by: syzbot+2676771ed06a6df166ad@syzkaller.appspotmail.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/mlme.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 581df7f4c5240..e7fa0608341d8 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -277,6 +277,11 @@ int cfg80211_mlme_auth(struct cfg80211_registered_device *rdev, ether_addr_equal(req->bss->bssid, wdev->u.client.connected_addr)) return -EALREADY; + if (ether_addr_equal(req->bss->bssid, dev->dev_addr) || + (req->link_id >= 0 && + ether_addr_equal(req->ap_mld_addr, dev->dev_addr))) + return -EINVAL; + return rdev_auth(rdev, dev, req); } @@ -331,6 +336,9 @@ int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev, if (req->links[i].bss == req->links[j].bss) return -EINVAL; } + + if (ether_addr_equal(req->links[i].bss->bssid, dev->dev_addr)) + return -EINVAL; } if (wdev->connected && @@ -338,6 +346,11 @@ int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev, !ether_addr_equal(wdev->u.client.connected_addr, req->prev_bssid))) return -EALREADY; + if ((req->bss && ether_addr_equal(req->bss->bssid, dev->dev_addr)) || + (req->link_id >= 0 && + ether_addr_equal(req->ap_mld_addr, dev->dev_addr))) + return -EINVAL; + cfg80211_oper_and_ht_capa(&req->ht_capa_mask, rdev->wiphy.ht_capa_mod_mask); cfg80211_oper_and_vht_capa(&req->vht_capa_mask, -- 2.40.1