public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH 5.10 3/4] wifi: mac80211: dont parse mbssid in assoc response
Date: Sun, 16 Oct 2022 08:46:13 +0200	[thread overview]
Message-ID: <20221016064454.487620750@linuxfoundation.org> (raw)
In-Reply-To: <20221016064454.382206984@linuxfoundation.org>

From: Johannes Berg <johannes.berg@intel.com>

This is simply not valid and simplifies the next commit.
I'll make a separate patch for this in the current main
tree as well.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/mac80211/mlme.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3300,7 +3300,7 @@ static bool ieee80211_assoc_success(stru
 	}
 	capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
 	ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, elems,
-			       mgmt->bssid, assoc_data->bss->bssid);
+			       mgmt->bssid, NULL);
 
 	if (elems->aid_resp)
 		aid = le16_to_cpu(elems->aid_resp->aid);
@@ -3708,7 +3708,7 @@ static void ieee80211_rx_mgmt_assoc_resp
 		return;
 
 	ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, &elems,
-			       mgmt->bssid, assoc_data->bss->bssid);
+			       mgmt->bssid, NULL);
 
 	if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY &&
 	    elems.timeout_int &&



  parent reply	other threads:[~2022-10-16  6:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-16  6:46 [PATCH 5.10 0/4] 5.10.149-rc1 review Greg Kroah-Hartman
2022-10-16  6:46 ` [PATCH 5.10 1/4] Revert "fs: check FMODE_LSEEK to control internal pipe splicing" Greg Kroah-Hartman
2022-10-16  6:46 ` [PATCH 5.10 2/4] mac80211: mlme: find auth challenge directly Greg Kroah-Hartman
2022-10-16  6:46 ` Greg Kroah-Hartman [this message]
2022-10-16  6:46 ` [PATCH 5.10 4/4] wifi: mac80211: fix MBSSID parsing use-after-free Greg Kroah-Hartman
2022-10-16  8:02 ` [PATCH 5.10 0/4] 5.10.149-rc1 review Rudi Heitbaum
2022-10-16  9:50 ` Pavel Machek
2022-10-16 19:19 ` Guenter Roeck
2022-10-17  7:26 ` Naresh Kamboju
2022-10-17  8:57 ` Sudip Mukherjee (Codethink)
2022-10-17 10:01 ` Jon Hunter
2022-10-17 18:08 ` Florian Fainelli
2022-10-17 18:08 ` Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221016064454.487620750@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=johannes.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox