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

Commit 7d1559f1 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix sta-info pinning 



When a STA is supposed to be unlinked but is pinned, it still needs
to be unlinked from all structures. Only at the end of the unlink
process should we check for pin status and invalidate the callers
reference if it is pinned. Move the pin status check down.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4d6141c3

net/mac80211/sta_info.c

+32 −32
Original line number Original line Diff line number Diff line
@@ -439,8 +439,39 @@ void __sta_info_unlink(struct sta_info **sta) 
		return;

		return;

	}

	}





	list_del(&(*sta)->list);



	if ((*sta)->flags & WLAN_STA_PS) {

		(*sta)->flags &= ~WLAN_STA_PS;

		if (sdata->bss)

			atomic_dec(&sdata->bss->num_sta_ps);

		__sta_info_clear_tim_bit(sdata->bss, *sta);

	}



	local->num_sta--;



	if (local->ops->sta_notify) {

		if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN)

			sdata = sdata->u.vlan.ap;



		local->ops->sta_notify(local_to_hw(local), &sdata->vif,

				       STA_NOTIFY_REMOVE, (*sta)->addr);

	}



	if (ieee80211_vif_is_mesh(&sdata->vif)) {

		mesh_accept_plinks_update(sdata);

#ifdef CONFIG_MAC80211_MESH

		del_timer(&(*sta)->plink_timer);

#endif

	}



#ifdef CONFIG_MAC80211_VERBOSE_DEBUG

	printk(KERN_DEBUG "%s: Removed STA %s\n",

	       wiphy_name(local->hw.wiphy), print_mac(mbuf, (*sta)->addr));

#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */



	/*

	/*

	 * Also pull caller's reference if the STA is pinned by the

	 * Finally, pull caller's reference if the STA is pinned by the

	 * task that is adding the debugfs entries. In that case, we

	 * task that is adding the debugfs entries. In that case, we

	 * leave the STA "to be freed".

	 * leave the STA "to be freed".

	 *

	 *
@@ -472,37 +503,6 @@ void __sta_info_unlink(struct sta_info **sta) 
		*sta = NULL;

		*sta = NULL;

		return;

		return;

	}

	}



	list_del(&(*sta)->list);



	if ((*sta)->flags & WLAN_STA_PS) {

		(*sta)->flags &= ~WLAN_STA_PS;

		if (sdata->bss)

			atomic_dec(&sdata->bss->num_sta_ps);

		__sta_info_clear_tim_bit(sdata->bss, *sta);

	}



	local->num_sta--;



	if (local->ops->sta_notify) {

		if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN)

			sdata = sdata->u.vlan.ap;



		local->ops->sta_notify(local_to_hw(local), &sdata->vif,

				       STA_NOTIFY_REMOVE, (*sta)->addr);

	}



	if (ieee80211_vif_is_mesh(&sdata->vif)) {

		mesh_accept_plinks_update(sdata);

#ifdef CONFIG_MAC80211_MESH

		del_timer(&(*sta)->plink_timer);

#endif

	}



#ifdef CONFIG_MAC80211_VERBOSE_DEBUG

	printk(KERN_DEBUG "%s: Removed STA %s\n",

	       wiphy_name(local->hw.wiphy), print_mac(mbuf, (*sta)->addr));

#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */

}

}





void sta_info_unlink(struct sta_info **sta)

void sta_info_unlink(struct sta_info **sta)