From 6adb6a20601782d289e44a3bfd96788bfb0913cb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Oct 2022 20:01:14 +0200 Subject: [PATCH] updated queue-5.19/wifi-mac80211-fix-mbssid-parsing-use-after-free.patch --- ...c80211-fix-mbssid-parsing-use-after-free.patch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/queue-5.19/wifi-mac80211-fix-mbssid-parsing-use-after-free.patch b/queue-5.19/wifi-mac80211-fix-mbssid-parsing-use-after-free.patch index 1a0c1c4927e..8c7e6018921 100644 --- a/queue-5.19/wifi-mac80211-fix-mbssid-parsing-use-after-free.patch +++ b/queue-5.19/wifi-mac80211-fix-mbssid-parsing-use-after-free.patch @@ -29,8 +29,8 @@ Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/ieee80211_i.h | 8 ++++++++ - net/mac80211/util.c | 31 ++++++++++++++++--------------- - 2 files changed, 24 insertions(+), 15 deletions(-) + net/mac80211/util.c | 30 +++++++++++++++--------------- + 2 files changed, 23 insertions(+), 15 deletions(-) --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman static inline struct ieee80211_local *hw_to_local( --- a/net/mac80211/util.c +++ b/net/mac80211/util.c -@@ -1503,25 +1503,28 @@ struct ieee802_11_elems *ieee802_11_pars +@@ -1503,25 +1503,27 @@ struct ieee802_11_elems *ieee802_11_pars const struct element *non_inherit = NULL; u8 *nontransmitted_profile; int nontransmitted_profile_len = 0; @@ -86,14 +86,13 @@ Signed-off-by: Greg Kroah-Hartman + nontransmitted_profile); + elems->scratch_pos += nontransmitted_profile_len; + elems->scratch_len -= nontransmitted_profile_len; -+ non_inherit = -+ cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, -+ nontransmitted_profile, -+ nontransmitted_profile_len); ++ non_inherit = cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, ++ nontransmitted_profile, ++ nontransmitted_profile_len); crc = _ieee802_11_parse_elems_crc(start, len, action, elems, filter, crc, non_inherit); -@@ -1550,8 +1553,6 @@ struct ieee802_11_elems *ieee802_11_pars +@@ -1550,8 +1552,6 @@ struct ieee802_11_elems *ieee802_11_pars offsetofend(struct ieee80211_bssid_index, dtim_count)) elems->dtim_count = elems->bssid_index->dtim_count; -- 2.47.3