mac80211: fix memory leak
authorJohannes Berg <johannes.berg@intel.com>
Wed, 20 May 2015 09:31:47 +0000 (11:31 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 20 May 2015 09:37:38 +0000 (11:37 +0200)
My recent change here introduced a possible memory leak if the
driver registers an invalid cipher schemes. This won't really
happen in practice, but fix the leak nonetheless.

Fixes: e3a55b5399d55 ("mac80211: validate cipher scheme PN length better")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/main.c

index 3c956c5f99b2886bcd0516ee4ba598c02fb839bb..99d27babd9f08c19eb4983aee63704d9897b0ed3 100644 (file)
@@ -770,8 +770,10 @@ static int ieee80211_init_cipher_suites(struct ieee80211_local *local)
 
                for (r = 0; r < local->hw.n_cipher_schemes; r++) {
                        suites[w++] = cs[r].cipher;
-                       if (WARN_ON(cs[r].pn_len > IEEE80211_MAX_PN_LEN))
+                       if (WARN_ON(cs[r].pn_len > IEEE80211_MAX_PN_LEN)) {
+                               kfree(suites);
                                return -EINVAL;
+                       }
                }
        }