summaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-09-06 15:55:50 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-09-06 15:56:02 +0200
commit944b9e375d89271c39995d363f62cb91734fae5f (patch)
treebd6014bd0be251cdf2b32b12ca8a62e55742c0ee /net/wireless/nl80211.c
parenta4ed53466a289a4139405bf7190c78a8e9d8debf (diff)
parent7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c (diff)
downloadop-kernel-dev-944b9e375d89271c39995d363f62cb91734fae5f.zip
op-kernel-dev-944b9e375d89271c39995d363f62cb91734fae5f.tar.gz
Merge remote-tracking branch 'mac80211/master' into mac80211-next
Pull in mac80211.git to let the next patch apply without conflicts, also resolving a hwsim conflict. Conflicts: drivers/net/wireless/mac80211_hwsim.c Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r--net/wireless/nl80211.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 787aeaa..222189b6 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5656,8 +5656,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));
OpenPOWER on IntegriCloud