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

Commit 7445b711 authored by Arunk Khandavalli's avatar Arunk Khandavalli Committed by Greg Kroah-Hartman
Browse files

cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE 



[ Upstream commit 4f0223bfe9c3e62d8f45a85f1ef1b18a8a263ef9 ]

nl80211_update_ft_ies() tried to validate NL80211_ATTR_IE with
is_valid_ie_attr() before dereferencing it, but that helper function
returns true in case of NULL pointer (i.e., attribute not included).
This can result to dereferencing a NULL pointer. Fix that by explicitly
checking that NL80211_ATTR_IE is included.

Fixes: 355199e0 ("cfg80211: Extend support for IEEE 802.11r Fast BSS Transition")
Signed-off-by: default avatarArunk Khandavalli <akhandav@codeaurora.org>
Signed-off-by: default avatarJouni Malinen <jouni@codeaurora.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd23c326

net/wireless/nl80211.c

+1 −0
Original line number Diff line number Diff line
@@ -10014,6 +10014,7 @@ static int nl80211_update_ft_ies(struct sk_buff *skb, struct genl_info *info) 
		return -EOPNOTSUPP;



	if (!info->attrs[NL80211_ATTR_MDID] ||

	    !info->attrs[NL80211_ATTR_IE] ||

	    !is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))

		return -EINVAL;