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

Commit bad29297 authored by Andrew Zaborowski's avatar Andrew Zaborowski Committed by Johannes Berg
Browse files

nl80211: Reject disconnect commands except from conn_owner 



Reject NL80211_CMD_DISCONNECT, NL80211_CMD_DISASSOCIATE,
NL80211_CMD_DEAUTHENTICATE and NL80211_CMD_ASSOCIATE commands
from clients other than the connection owner set in the connect,
authenticate or associate commands, if it was set.

The main point of this check is to prevent chaos when two processes
try to use nl80211 at the same time, it's not a security measure.
The same thing should possibly be done for JOIN_IBSS/LEAVE_IBSS and
START_AP/STOP_AP.

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

net/wireless/nl80211.c

+16 −0
Original line number Diff line number Diff line
@@ -8514,6 +8514,10 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info) 
	const u8 *bssid, *ssid;

	int err, ssid_len = 0;



	if (dev->ieee80211_ptr->conn_owner_nlportid &&

	    dev->ieee80211_ptr->conn_owner_nlportid != info->snd_portid)

		return -EPERM;



	if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))

		return -EINVAL;
@@ -8636,6 +8640,10 @@ static int nl80211_deauthenticate(struct sk_buff *skb, struct genl_info *info) 
	u16 reason_code;

	bool local_state_change;



	if (dev->ieee80211_ptr->conn_owner_nlportid &&

	    dev->ieee80211_ptr->conn_owner_nlportid != info->snd_portid)

		return -EPERM;



	if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))

		return -EINVAL;
@@ -8683,6 +8691,10 @@ static int nl80211_disassociate(struct sk_buff *skb, struct genl_info *info) 
	u16 reason_code;

	bool local_state_change;



	if (dev->ieee80211_ptr->conn_owner_nlportid &&

	    dev->ieee80211_ptr->conn_owner_nlportid != info->snd_portid)

		return -EPERM;



	if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))

		return -EINVAL;
@@ -9512,6 +9524,10 @@ static int nl80211_disconnect(struct sk_buff *skb, struct genl_info *info) 
	u16 reason;

	int ret;



	if (dev->ieee80211_ptr->conn_owner_nlportid &&

	    dev->ieee80211_ptr->conn_owner_nlportid != info->snd_portid)

		return -EPERM;



	if (!info->attrs[NL80211_ATTR_REASON_CODE])

		reason = WLAN_REASON_DEAUTH_LEAVING;

	else