diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-05 14:48:15 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-05 14:48:15 -0400 |
| commit | 785a7de9ee5ab1ff2ec9c6e58667bde1055f2f1b (patch) | |
| tree | 8846881677b2a72de5229a7e83e65d97469a7cb2 /net/wireless | |
| parent | 518eefe1b6fe53b347ffdfbb15a9367efbfd1955 (diff) | |
| parent | 7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c (diff) | |
| download | talos-obmc-linux-785a7de9ee5ab1ff2ec9c6e58667bde1055f2f1b.tar.gz talos-obmc-linux-785a7de9ee5ab1ff2ec9c6e58667bde1055f2f1b.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 97026f3b215a..1e37dbf00cb3 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5633,8 +5633,10 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) sizeof(connect.ht_capa_mask)); if (info->attrs[NL80211_ATTR_HT_CAPABILITY]) { - if (!info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK]) + if (!info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK]) { + kfree(connkeys); return -EINVAL; + } memcpy(&connect.ht_capa, nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY]), sizeof(connect.ht_capa)); |
