Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67aa030c authored by Mariusz Kozlowski's avatar Mariusz Kozlowski Committed by John W. Linville
Browse files

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: default avatarMariusz Kozlowski <mk@lab.zgora.pl>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1f951a7f

net/mac80211/key.c

+2 −1
Original line number Diff line number Diff line
@@ -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;