Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f3b5ab8 authored by Johannes Berg's avatar Johannes Berg Committed by Treehugger Robot
Browse files

UPSTREAM: wifi: mac80211: fix MBSSID parsing use-after-free 



Commit ff05d4b45dd89b922578dac497dcabf57cf771c6 upstream.
This is a different version of the commit, changed to store
the non-transmitted profile in the elems, and freeing it in
the few places where it's relevant, since that is only the
case when the last argument for parsing (the non-tx BSSID)
is non-NULL.

When we parse a multi-BSSID element, we might point some
element pointers into the allocated nontransmitted_profile.
However, we free this before returning, causing UAF when the
relevant pointers in the parsed elements are accessed.

Fix this by not allocating the scratch buffer separately but
as part of the returned structure instead, that way, there
are no lifetime issues with it.

The scratch buffer introduction as part of the returned data
here is taken from MLO feature work done by Ilan.

This fixes CVE-2022-42719.

Bug: 253642087
Fixes: 5023b14c ("mac80211: support profile split between elements")
Co-developed-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I4c6f396d82a1a5754b1d6948c367009d889d40f9
parent 09cd270b

net/mac80211/ieee80211_i.h

+2 −0
Original line number Diff line number Diff line
@@ -1521,6 +1521,8 @@ struct ieee802_11_elems { 
	u8 country_elem_len;

	u8 bssid_index_len;



	void *nontx_profile;



	/* whether a parse error occurred while retrieving these elements */

	bool parse_error;

};

net/mac80211/mlme.c

+5 −1
Original line number Diff line number Diff line
@@ -3301,6 +3301,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, 
			sdata_info(sdata,

				   "AP bug: VHT operation missing from AssocResp\n");

		}

		kfree(bss_elems.nontx_profile);

	}



	/*
@@ -3885,6 +3886,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
		ifmgd->assoc_data->timeout = jiffies;

		ifmgd->assoc_data->timeout_started = true;

		run_again(sdata, ifmgd->assoc_data->timeout);

		kfree(elems.nontx_profile);

		return;

	}
@@ -4052,7 +4054,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
		ieee80211_report_disconnect(sdata, deauth_buf,

					    sizeof(deauth_buf), true,

					    WLAN_REASON_DEAUTH_LEAVING);

		return;

		goto free;

	}



	if (sta && elems.opmode_notif)
@@ -4067,6 +4069,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
					       elems.cisco_dtpc_elem);



	ieee80211_bss_info_change_notify(sdata, changed);

free:

	kfree(elems.nontx_profile);

}



void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,

net/mac80211/scan.c

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ ieee80211_bss_info_update(struct ieee80211_local *local, 
						rx_status, beacon);

	}



	kfree(elems.nontx_profile);



	return bss;

}

net/mac80211/util.c

+6 −1
Original line number Diff line number Diff line
@@ -1365,6 +1365,11 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, 
			cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE,

					       nontransmitted_profile,

					       nontransmitted_profile_len);

		if (!nontransmitted_profile_len) {

			nontransmitted_profile_len = 0;

			kfree(nontransmitted_profile);

			nontransmitted_profile = NULL;

		}

	}



	crc = _ieee802_11_parse_elems_crc(start, len, action, elems, filter,
@@ -1394,7 +1399,7 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, 
	    offsetofend(struct ieee80211_bssid_index, dtim_count))

		elems->dtim_count = elems->bssid_index->dtim_count;



	kfree(nontransmitted_profile);

	elems->nontx_profile = nontransmitted_profile;



	return crc;

}