git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From d350a0f431189517b1af0dbbb605c273231a8966 Mon Sep 17 00:00:00 2001
   2 From: Johannes Berg <johannes.berg@intel.com>
   3 Date: Sat, 15 Dec 2018 11:03:22 +0200
   4 Subject: [PATCH 2/3] nl80211: fix memory leak if validate_pae_over_nl80211()
   5  fails
   6
   7 If validate_pae_over_nl80211() were to fail in nl80211_crypto_settings(),
   8 we might leak the 'connkeys' allocation. Fix this.
   9
  10 Fixes: 64bf3d4bc2b0 ("nl80211: Add CONTROL_PORT_OVER_NL80211 attribute")
  11 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  12 ---
  13  net/wireless/nl80211.c | 4 +++-
  14  1 file changed, 3 insertions(+), 1 deletion(-)
  15
  16 --- a/net/wireless/nl80211.c
  17 +++ b/net/wireless/nl80211.c
  18 @@ -9002,8 +9002,10 @@ static int nl80211_join_ibss(struct sk_b
  19         if (info->attrs[NL80211_ATTR_CONTROL_PORT_OVER_NL80211]) {
  20                 int r = validate_pae_over_nl80211(rdev, info);
  21
  22 -               if (r < 0)
  23 +               if (r < 0) {
  24 +                       kzfree(connkeys);
  25                         return r;
  26 +               }
  27
  28                 ibss.control_port_over_nl80211 = true;
  29         }