summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2008-06-26 12:13:46 +0300
committerJohn W. Linville <linville@tuxdriver.com>2008-06-27 14:49:52 -0400
commit00eb7fe77eb455f807c396f9917f0f623d4c84bb (patch)
treece67292589f9c387ff31203db36cb220202a7ee7 /net
parent5f4a6fae46a214c4dce3bd63a6219a5f1c818c78 (diff)
downloadlinux-3.10-00eb7fe77eb455f807c396f9917f0f623d4c84bb.tar.gz
linux-3.10-00eb7fe77eb455f807c396f9917f0f623d4c84bb.tar.bz2
linux-3.10-00eb7fe77eb455f807c396f9917f0f623d4c84bb.zip
mac80211: fix an oops in several failure paths in key allocation
This patch fixes an oops in several failure paths in key allocation. This Oops occurs when freeing a key that has not been linked yet, so the key->sdata is not set. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/key.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 150d66dbda9..220e83be3ef 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -380,6 +380,15 @@ void ieee80211_key_free(struct ieee80211_key *key)
if (!key)
return;
+ if (!key->sdata) {
+ /* The key has not been linked yet, simply free it
+ * and don't Oops */
+ if (key->conf.alg == ALG_CCMP)
+ ieee80211_aes_key_free(key->u.ccmp.tfm);
+ kfree(key);
+ return;
+ }
+
spin_lock_irqsave(&key->sdata->local->key_lock, flags);
__ieee80211_key_free(key);
spin_unlock_irqrestore(&key->sdata->local->key_lock, flags);