Skip to content

Commit 6624bb3

Browse files
committed
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: Lee Jones <lee.jones@linaro.org> Link: https://lore.kernel.org/r/20220411114201.fd4a31f06541.Ie7ff4be2cf348d8cc28ed0d626fc54becf7ea799@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 5a6b06f commit 6624bb3

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

net/wireless/nl80211.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,8 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
528528
.len = IEEE80211_MAX_MESH_ID_LEN },
529529
[NL80211_ATTR_MPATH_NEXT_HOP] = NLA_POLICY_ETH_ADDR_COMPAT,
530530

531-
[NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 },
531+
/* allow 3 for NUL-termination, we used to declare this NLA_STRING */
532+
[NL80211_ATTR_REG_ALPHA2] = NLA_POLICY_RANGE(NLA_BINARY, 2, 3),
532533
[NL80211_ATTR_REG_RULES] = { .type = NLA_NESTED },
533534

534535
[NL80211_ATTR_BSS_CTS_PROT] = { .type = NLA_U8 },

0 commit comments

Comments
 (0)