summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorOla Olsson <ola1olsson@gmail.com>2016-02-11 01:00:22 +0100
committerJohannes Berg <johannes.berg@intel.com>2016-02-23 10:40:36 +0100
commit5e950a78bf5b18ded277a27aed0bcdbe7c1b868a (patch)
tree572e9f403c7867c65f605343fcb9527d2e1e87c8 /net
parent7a36b930e6ed4702c866dc74a5ad07318a57c688 (diff)
downloadlinux-sh-5e950a78bf5b18ded277a27aed0bcdbe7c1b868a.tar.gz
nl80211: Zero out the connection keys memory when freeing them.
The connection keys are zeroed out in all other cases except this one. Let's fix the last one as well. Signed-off-by: Ola Olsson <ola.olsson@sonymobile.com> Reviewed-by: Julian Calaby <julian.calaby@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index d4786f2802aa..711cb7ad6ae0 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7547,7 +7547,7 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
if ((ibss.chandef.width != NL80211_CHAN_WIDTH_20_NOHT) &&
no_ht) {
- kfree(connkeys);
+ kzfree(connkeys);
return -EINVAL;
}
}