You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
934 B
Diff
30 lines
934 B
Diff
From d350a0f431189517b1af0dbbb605c273231a8966 Mon Sep 17 00:00:00 2001
|
|
From: Johannes Berg <johannes.berg@intel.com>
|
|
Date: Sat, 15 Dec 2018 11:03:22 +0200
|
|
Subject: [PATCH 2/3] 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>
|
|
---
|
|
net/wireless/nl80211.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/net/wireless/nl80211.c
|
|
+++ b/net/wireless/nl80211.c
|
|
@@ -9002,8 +9002,10 @@ static int nl80211_join_ibss(struct sk_b
|
|
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;
|
|
}
|