diff --git a/[refs] b/[refs] index 4dda4e8416af..f6781ce332c4 100644 --- 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 index 97026f3b215a..1e37dbf00cb3 100644 --- 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));