X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Fkey.c;h=6597c779e35a946147c510b5f0659afb4b40bce7;hb=c34498b9e633baa3266af98106502633b6bc371b;hp=d4893bd177548a33c3cbbfd0fd54bab6d5a933e4;hpb=f42a44494bcdf03fc851c03d438464d59c0ceaf5;p=linux-2.6

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index d4893bd177..6597c779e3 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -387,6 +387,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);