]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
cfg80211: Check if NAN service ID is of expected size
authorSrinivas Dasari <dasaris@qti.qualcomm.com>
Thu, 6 Jul 2017 22:43:40 +0000 (01:43 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 7 Jul 2017 09:22:21 +0000 (11:22 +0200)
commit0a27844ce86d039d74221dd56cd8c0349b146b63
tree8ed068b10a4d3bdd751e335265173e76a123ba56
parent9361df14d1cbf966409d5d6f48bb334384fbe138
cfg80211: Check if NAN service ID is of expected size

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, cfg80211 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_NAN_FUNC_SERVICE_ID to make these NLA_UNSPEC and to make sure
minimum NL80211_NAN_FUNC_SERVICE_ID_LEN bytes are received from
userspace with NL80211_NAN_FUNC_SERVICE_ID.

Fixes: a442b761b24 ("cfg80211: add add_nan_func / del_nan_func")
Cc: stable@vger.kernel.org
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>
net/wireless/nl80211.c