summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2018-12-15 11:03:22 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-12-19 09:40:17 +0100
commitd350a0f431189517b1af0dbbb605c273231a8966 (patch)
treede90deadfe27057b77b99c3d7fe3b4fac0b69f54 /net
parenta50e5fb8db83c5b57392204c21ea6c5c4ccefde6 (diff)
downloadlinux-d350a0f431189517b1af0dbbb605c273231a8966.tar.gz
linux-d350a0f431189517b1af0dbbb605c273231a8966.tar.bz2
linux-d350a0f431189517b1af0dbbb605c273231a8966.zip
nl80211: fix memory leak if validate_pae_over_nl80211() fails
If validate_pae_over_nl80211() were to fail in nl80211_crypto_settings(), we might leak the 'connkeys' allocation. Fix this. Fixes: 64bf3d4bc2b0 ("nl80211: Add CONTROL_PORT_OVER_NL80211 attribute") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-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 8d763725498c..2317727d6413 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -8930,8 +8930,10 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
if (info->attrs[NL80211_ATTR_CONTROL_PORT_OVER_NL80211]) {
int r = validate_pae_over_nl80211(rdev, info);
- if (r < 0)
+ if (r < 0) {
+ kzfree(connkeys);
return r;
+ }
ibss.control_port_over_nl80211 = true;
}