Commit a19cf684 authored Dec 11, 2021 by Johannes Berg Committed by Greg Kroah-Hartman Dec 22, 2021

mac80211: validate extended element ID is present



commit 768c0b19b50665e337c96858aa2b7928d6dcf756 upstream.

Before attempting to parse an extended element, verify that
the extended element ID is present.

Fixes: 41cbb0f5 ("mac80211: add support for HE")
Reported-by:  <syzbot+59bdff68edce82e393b6@syzkaller.appspotmail.com>
Link: https://lore.kernel.org/r/20211211201023.f30a1b128c07.I5cacc176da94ba316877c6e10fe3ceec8b4dbd7d@changeid


Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e070c0c9

net/mac80211/util.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1227,6 +1227,8 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
		elems->max_idle_period_ie = (void *)pos;
		break;
		case WLAN_EID_EXTENSION:
		if (!elen)
		break;
		if (pos[0] == WLAN_EID_EXT_HE_MU_EDCA &&
		elen >= (sizeof(*elems->mu_edca_param_set) + 1)) {
		elems->mu_edca_param_set = (void *)&pos[1];