X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Fkey.c;h=220e83be3ef4a3dad7331f451bb95021d7c04701;hb=2ddddb98694af847f70463dbdc69aa491d9f477a;hp=150d66dbda9d22de6ca0b94c48eab7e70c3f733f;hpb=3925e6fc1f774048404fdd910b0345b06c699eb4;p=linux-2.6

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 150d66dbda..220e83be3e 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);