mac80211: fix possible NULL pointer dereference
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 <mk@lab.zgora.pl> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
1f951a7f8b
commit
67aa030c0d
|
@ -400,11 +400,12 @@ int ieee80211_key_link(struct ieee80211_key *key,
|
||||||
{
|
{
|
||||||
struct ieee80211_key *old_key;
|
struct ieee80211_key *old_key;
|
||||||
int idx, ret;
|
int idx, ret;
|
||||||
bool pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
|
bool pairwise;
|
||||||
|
|
||||||
BUG_ON(!sdata);
|
BUG_ON(!sdata);
|
||||||
BUG_ON(!key);
|
BUG_ON(!key);
|
||||||
|
|
||||||
|
pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
|
||||||
idx = key->conf.keyidx;
|
idx = key->conf.keyidx;
|
||||||
key->local = sdata->local;
|
key->local = sdata->local;
|
||||||
key->sdata = sdata;
|
key->sdata = sdata;
|
||||||
|
|
Loading…
Reference in New Issue