diff options
author | Ingo Molnar | 2008-07-08 07:47:47 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-08 07:47:47 +0200 |
commit | 93022136fff9e6130aa128a5ed8a599e93ac813c (patch) | |
tree | 185390fb75a3d7423cc508610b76637c957205b9 /net/mac80211/key.c | |
parent | x86: make 64bit identify_cpu use cpu_dev v2 (diff) | |
parent | Linux 2.6.26-rc9 (diff) | |
download | kernel-qcow2-linux-93022136fff9e6130aa128a5ed8a599e93ac813c.tar.gz kernel-qcow2-linux-93022136fff9e6130aa128a5ed8a599e93ac813c.tar.xz kernel-qcow2-linux-93022136fff9e6130aa128a5ed8a599e93ac813c.zip |
Merge commit 'v2.6.26-rc9' into x86/cpu
Diffstat (limited to 'net/mac80211/key.c')
-rw-r--r-- | net/mac80211/key.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 150d66dbda9d..220e83be3ef4 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); |