Skip to content

Commit 2d3c10e

Browse files
Srinivas Dasarigregkh
authored andcommitted
cfg80211: Check if PMKID attribute is of expected size
commit 9361df14d1cbf966409d5d6f48bb334384fbe138 upstream. nla policy checks for only maximum length of the attribute data when the attribute type is NLA_BINARY. If userspace sends less data than specified, the wireless drivers may access illegal memory. When type is NLA_UNSPEC, nla policy check ensures that userspace sends minimum specified length number of bytes. Remove type assignment to NLA_BINARY from nla_policy of NL80211_ATTR_PMKID to make this NLA_UNSPEC and to make sure minimum WLAN_PMKID_LEN bytes are received from userspace with NL80211_ATTR_PMKID. Fixes: 67fbb16 ("nl80211: PMKSA caching support") Signed-off-by: Srinivas Dasari <dasaris@qti.qualcomm.com> Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 24d0410 commit 2d3c10e

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

net/wireless/nl80211.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
302302
[NL80211_ATTR_WPA_VERSIONS] = { .type = NLA_U32 },
303303
[NL80211_ATTR_PID] = { .type = NLA_U32 },
304304
[NL80211_ATTR_4ADDR] = { .type = NLA_U8 },
305-
[NL80211_ATTR_PMKID] = { .type = NLA_BINARY,
306-
.len = WLAN_PMKID_LEN },
305+
[NL80211_ATTR_PMKID] = { .len = WLAN_PMKID_LEN },
307306
[NL80211_ATTR_DURATION] = { .type = NLA_U32 },
308307
[NL80211_ATTR_COOKIE] = { .type = NLA_U64 },
309308
[NL80211_ATTR_TX_RATES] = { .type = NLA_NESTED },

0 commit comments

Comments
 (0)