---

yaml --- r: 322766 b: refs/heads/master c: b4e4f47 h: refs/heads/master v: v3
git-mirror · Sep 4, 2012 · 99d5170 · 99d5170
1 parent 6d3e2ff
commit 99d5170
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d2abdfdf14f4d6decc2023708211e19b096f4ca
+refs/heads/master: b4e4f47e940bc93c5b1125a4429ff53956754800
diff --git a/trunk/net/wireless/nl80211.c b/trunk/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));