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

Commit f5609896 authored by Jukka Rissanen's avatar Jukka Rissanen Committed by Mark Salyzyn
Browse files

BACKPORT: nl80211: Stop scheduled scan if netlink client disappears 



(cherry pick from commit 93a1e86ce10e4898f9ca9cd09d659a8a7780ee5e)

An attribute NL80211_ATTR_SOCKET_OWNER can be set by the scan initiator.
If present, the attribute will cause the scan to be stopped if the client
dies.

Signed-off-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Bug: 25561044
Change-Id: I2343e494d2f4b4154ce945b61b97a68384fa92c1
parent 7828a50f

include/net/cfg80211.h

+3 −0
Original line number Diff line number Diff line
@@ -1465,6 +1465,8 @@ struct cfg80211_match_set { 
 * @channels: channels to scan

 * @min_rssi_thold: for drivers only supporting a single threshold, this

 *	contains the minimum over all matchsets

 * @owner_nlportid: netlink portid of owner (if this should is a request

 *	owned by a particular socket)

 */

struct cfg80211_sched_scan_request {

	struct cfg80211_ssid *ssids;
@@ -1483,6 +1485,7 @@ struct cfg80211_sched_scan_request { 
	struct wiphy *wiphy;

	struct net_device *dev;

	unsigned long scan_start;

	u32 owner_nlportid;



	/* keep last */

	struct ieee80211_channel *channels[0];

include/uapi/linux/nl80211.h

+4 −1
Original line number Diff line number Diff line
@@ -1608,7 +1608,10 @@ enum nl80211_commands { 
 *

 * @NL80211_ATTR_IFACE_SOCKET_OWNER: flag attribute, if set during interface

 *	creation then the new interface will be owned by the netlink socket

 *	that created it and will be destroyed when the socket is closed

 *	that created it and will be destroyed when the socket is closed.

 *	If set during scheduled scan start then the new scan req will be

 *	owned by the netlink socket that created it and the scheduled scan will

 *	be stopped when the socket is closed.

 *

 * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is

 *	the TDLS link initiator.

net/wireless/core.c

+16 −0
Original line number Diff line number Diff line
@@ -307,6 +307,20 @@ static void cfg80211_destroy_iface_wk(struct work_struct *work) 
	rtnl_unlock();

}



static void cfg80211_sched_scan_stop_wk(struct work_struct *work)

{

	struct cfg80211_registered_device *rdev;



	rdev = container_of(work, struct cfg80211_registered_device,

			   sched_scan_stop_wk);



	rtnl_lock();



	__cfg80211_stop_sched_scan(rdev, false);



	rtnl_unlock();

}



/* exported functions */



struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
@@ -368,6 +382,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv) 
	INIT_LIST_HEAD(&rdev->destroy_list);

	spin_lock_init(&rdev->destroy_list_lock);

	INIT_WORK(&rdev->destroy_work, cfg80211_destroy_iface_wk);

	INIT_WORK(&rdev->sched_scan_stop_wk, cfg80211_sched_scan_stop_wk);



#ifdef CONFIG_CFG80211_DEFAULT_PS

	rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
@@ -722,6 +737,7 @@ void wiphy_unregister(struct wiphy *wiphy) 
	flush_work(&rdev->event_work);

	cancel_delayed_work_sync(&rdev->dfs_update_channels_wk);

	flush_work(&rdev->destroy_work);

	flush_work(&rdev->sched_scan_stop_wk);



#ifdef CONFIG_PM

	if (rdev->wiphy.wowlan_config && rdev->ops->set_wakeup)

net/wireless/core.h

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ struct cfg80211_registered_device { 
	struct list_head destroy_list;

	struct work_struct destroy_work;



	struct work_struct sched_scan_stop_wk;



	/* must be last because of the way we do wiphy_priv(),

	 * and it should at least be aligned to NETDEV_ALIGN */

	struct wiphy wiphy __aligned(NETDEV_ALIGN);

net/wireless/nl80211.c

+16 −0
Original line number Diff line number Diff line
@@ -5835,6 +5835,9 @@ static int nl80211_start_sched_scan(struct sk_buff *skb, 


	err = rdev_sched_scan_start(rdev, dev, request);

	if (!err) {

		if (info->attrs[NL80211_ATTR_IFACE_SOCKET_OWNER])

			request->owner_nlportid = info->snd_portid;



		rdev->sched_scan_req = request;

		nl80211_send_sched_scan(rdev, dev,

					NL80211_CMD_START_SCHED_SCAN);
@@ -11949,6 +11952,13 @@ static int nl80211_netlink_notify(struct notifier_block * nb, 


	list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {

		bool schedule_destroy_work = false;

		bool schedule_scan_stop = false;

		struct cfg80211_sched_scan_request *sched_scan_req =

			rcu_dereference(rdev->sched_scan_req);



		if (sched_scan_req && notify->portid &&

		    sched_scan_req->owner_nlportid == notify->portid)

			schedule_scan_stop = true;



		list_for_each_entry_rcu(wdev, &rdev->wdev_list, list) {

			cfg80211_mlme_unregister_socket(wdev, notify->portid);
@@ -11979,6 +11989,12 @@ static int nl80211_netlink_notify(struct notifier_block * nb, 
				spin_unlock(&rdev->destroy_list_lock);

				schedule_work(&rdev->destroy_work);

			}

		} else if (schedule_scan_stop) {

			sched_scan_req->owner_nlportid = 0;



			if (rdev->ops->sched_scan_stop &&

			    rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN)

				schedule_work(&rdev->sched_scan_stop_wk);

		}

	}