diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-11-03 09:27:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 09:09:55 -0800 |
| commit | c1ce1705eb0778927a0b81a6eb29e8ff193aa3de (patch) | |
| tree | ce823c6988c2cda5d7db1abe6e1cf882dcf72c21 /net/wireless | |
| parent | ae1e9df381d5197015356e22de9d7acaf646a9ab (diff) | |
| download | kernel_samsung_smdk4412-c1ce1705eb0778927a0b81a6eb29e8ff193aa3de.zip kernel_samsung_smdk4412-c1ce1705eb0778927a0b81a6eb29e8ff193aa3de.tar.gz kernel_samsung_smdk4412-c1ce1705eb0778927a0b81a6eb29e8ff193aa3de.tar.bz2 | |
nl80211: fix HT capability attribute validation
commit 6c7394197af90f6a332180e33f5d025d3037d883 upstream.
Since the NL80211_ATTR_HT_CAPABILITY attribute is
used as a struct, it needs a minimum, not maximum
length. Enforce that properly. Not doing so could
potentially lead to reading after the buffer.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 1ac9443..3dac76f 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -126,8 +126,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = { [NL80211_ATTR_MESH_CONFIG] = { .type = NLA_NESTED }, [NL80211_ATTR_SUPPORT_MESH_AUTH] = { .type = NLA_FLAG }, - [NL80211_ATTR_HT_CAPABILITY] = { .type = NLA_BINARY, - .len = NL80211_HT_CAPABILITY_LEN }, + [NL80211_ATTR_HT_CAPABILITY] = { .len = NL80211_HT_CAPABILITY_LEN }, [NL80211_ATTR_MGMT_SUBTYPE] = { .type = NLA_U8 }, [NL80211_ATTR_IE] = { .type = NLA_BINARY, |