Commit 6624bb34 authored by Johannes Berg's avatar Johannes Berg
Browse files

nl80211: correctly check NL80211_ATTR_REG_ALPHA2 size 



We need this to be at least two bytes, so we can access
alpha2[0] and alpha2[1]. It may be three in case some
userspace used NUL-termination since it was NLA_STRING
(and we also push it out with NUL-termination).

Cc: stable@vger.kernel.org
Reported-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220411114201.fd4a31f06541.Ie7ff4be2cf348d8cc28ed0d626fc54becf7ea799@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5a6b06f5

net/wireless/nl80211.c

+2 −1
Original line number Diff line number Diff line
@@ -528,7 +528,8 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
				   .len = IEEE80211_MAX_MESH_ID_LEN },

	[NL80211_ATTR_MPATH_NEXT_HOP] = NLA_POLICY_ETH_ADDR_COMPAT,



	[NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 },

	/* allow 3 for NUL-termination, we used to declare this NLA_STRING */

	[NL80211_ATTR_REG_ALPHA2] = NLA_POLICY_RANGE(NLA_BINARY, 2, 3),

	[NL80211_ATTR_REG_RULES] = { .type = NLA_NESTED },



	[NL80211_ATTR_BSS_CTS_PROT] = { .type = NLA_U8 },