[PATCH] mac80211: fix possible NULL pointer dereference
From: Mariusz Kozlowski <hidden>
Date: 2011-03-26 17:59:13
Also in:
linux-wireless, lkml
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
This patch moves 'key' dereference after BUG_ON(!key) so that when key is NULL we will see proper trace instead of oops. Signed-off-by: Mariusz Kozlowski <redacted> --- net/mac80211/key.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 8c02469..fd97925 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c@@ -400,11 +400,12 @@ int ieee80211_key_link(struct ieee80211_key *key, { struct ieee80211_key *old_key; int idx, ret; - bool pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE; + bool pairwise; BUG_ON(!sdata); BUG_ON(!key); + pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE; idx = key->conf.keyidx; key->local = sdata->local; key->sdata = sdata;
--
1.7.0.4