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

Commit 7181d467 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: avoid crashing when no scan sdata 



Using the scan_sdata variable here is terribly wrong,
if there has never been a scan then we fail. However,
we need a bandaid...

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: stable@kernel.org [2.6.29]
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1269fa73

net/mac80211/mlme.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2113,12 +2113,13 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) 
	struct ieee80211_local *local =

	struct ieee80211_local *local =

		container_of(work, struct ieee80211_local,

		container_of(work, struct ieee80211_local,

			     dynamic_ps_enable_work);

			     dynamic_ps_enable_work);

	/* XXX: using scan_sdata is completely broken! */

	struct ieee80211_sub_if_data *sdata = local->scan_sdata;

	struct ieee80211_sub_if_data *sdata = local->scan_sdata;





	if (local->hw.conf.flags & IEEE80211_CONF_PS)

	if (local->hw.conf.flags & IEEE80211_CONF_PS)

		return;

		return;





	if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)

	if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK && sdata)

		ieee80211_send_nullfunc(local, sdata, 1);

		ieee80211_send_nullfunc(local, sdata, 1);





	local->hw.conf.flags |= IEEE80211_CONF_PS;

	local->hw.conf.flags |= IEEE80211_CONF_PS;