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

Commit 0dbd3a4c authored by Andrew Zaborowski's avatar Andrew Zaborowski Committed by Min Liu
Browse files

cfg80211: NL80211_ATTR_SOCKET_OWNER support for CMD_CONNECT 



Disconnect or deauthenticate when the owning socket is closed if this
flag is supplied to CMD_CONNECT or CMD_ASSOCIATE.  This may be used
to ensure userspace daemon doesn't leave an unmanaged connection behind.

In some situations it would be possible to account for that, to some
degree, in the deamon restart code or in the up/down scripts without
the use of this attribute.  But there will be systems where the daemon
can go away for varying periods without a warning due to local resource
management.

Signed-off-by: default avatarAndrew Zaborowski <andrew.zaborowski@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>

Git-commit: 36a554cec119bbd20c4ec0cb96bd4712d124bfea
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/


mac80211-next.git
Change-Id: Ic09ee323fc6215059d5c2572ba3e77c56addad32
CRs-Fixed: 2182553
Signed-off-by: default avatarSrinivas Dasari <dasaris@codeaurora.org>
Signed-off-by: default avatarJiachao Wu <jiacwu@codeaurora.org>
Signed-off-by: default avatarMin Liu <minliu@codeaurora.org>
parent 58a9174f

include/net/cfg80211.h

+7 −0
Original line number Diff line number Diff line
@@ -3730,6 +3730,9 @@ struct cfg80211_cached_keys; 
 * @conn: (private) cfg80211 software SME connection state machine data

 * @connect_keys: (private) keys to set after connection is established

 * @conn_bss_type: connecting/connected BSS type

 * @conn_owner_nlportid: (private) connection owner socket port ID

 * @disconnect_wk: (private) auto-disconnect work

 * @disconnect_bssid: (private) the BSSID to use for auto-disconnect

 * @ibss_fixed: (private) IBSS is using fixed BSSID

 * @ibss_dfs_possible: (private) IBSS may change to a DFS channel

 * @event_list: (private) list for internal event processing
@@ -3761,6 +3764,10 @@ struct wireless_dev { 
	struct cfg80211_conn *conn;

	struct cfg80211_cached_keys *connect_keys;

	enum ieee80211_bss_type conn_bss_type;

	u32 conn_owner_nlportid;



	struct work_struct disconnect_wk;

	u8 disconnect_bssid[ETH_ALEN];



	struct list_head event_list;

	spinlock_t event_lock;

include/uapi/linux/nl80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1833,6 +1833,8 @@ enum nl80211_commands { 
 *	regulatory indoor configuration would be owned by the netlink socket

 *	that configured the indoor setting, and the indoor operation would be

 *	cleared when the socket is closed.

 *	If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the

 *	station will deauthenticate when the socket is closed.

 *

 * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is

 *	the TDLS link initiator.

net/wireless/core.c

+2 −0
Original line number Diff line number Diff line
@@ -1081,6 +1081,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, 
		     wdev->iftype == NL80211_IFTYPE_P2P_CLIENT ||

		     wdev->iftype == NL80211_IFTYPE_ADHOC) && !wdev->use_4addr)

			dev->priv_flags |= IFF_DONT_BRIDGE;

		INIT_WORK(&wdev->disconnect_wk, cfg80211_autodisconnect_wk);

		break;

	case NETDEV_GOING_DOWN:

		cfg80211_leave(rdev, wdev);
@@ -1166,6 +1167,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, 
#ifdef CONFIG_CFG80211_WEXT

			kzfree(wdev->wext.keys);

#endif

			flush_work(&wdev->disconnect_wk);

		}

		/*

		 * synchronise (so that we won't find this netdev

net/wireless/core.h

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ void __cfg80211_roamed(struct wireless_dev *wdev, 
		       const u8 *resp_ie, size_t resp_ie_len);

int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,

			      struct wireless_dev *wdev);

void cfg80211_autodisconnect_wk(struct work_struct *work);



/* SME implementation */

void cfg80211_conn_work(struct work_struct *work);

net/wireless/mlme.c

+5 −0
Original line number Diff line number Diff line
@@ -350,6 +350,11 @@ int cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev, 
	     !ether_addr_equal(wdev->current_bss->pub.bssid, bssid)))

		return 0;



	if (ether_addr_equal(wdev->disconnect_bssid, bssid) ||

	    (wdev->current_bss &&

	     ether_addr_equal(wdev->current_bss->pub.bssid, bssid)))

		wdev->conn_owner_nlportid = 0;



	return rdev_deauth(rdev, dev, &req);

}