Commit 0a7c9282 authored Jan 21, 2019 by Balaji Pothunoori Committed by Greg Kroah-Hartman Mar 05, 2019

mac80211: don't initiate TDLS connection if station is not associated to AP



[ Upstream commit 7ed5285396c257fd4070b1e29e7b2341aae2a1ce ]

Following call trace is observed while adding TDLS peer entry in driver
during TDLS setup.

Call Trace:
[<c1301476>] dump_stack+0x47/0x61
[<c10537d2>] __warn+0xe2/0x100
[<fa22415f>] ? sta_apply_parameters+0x49f/0x550 [mac80211]
[<c1053895>] warn_slowpath_null+0x25/0x30
[<fa22415f>] sta_apply_parameters+0x49f/0x550 [mac80211]
[<fa20ad42>] ? sta_info_alloc+0x1c2/0x450 [mac80211]
[<fa224623>] ieee80211_add_station+0xe3/0x160 [mac80211]
[<c1876fe3>] nl80211_new_station+0x273/0x420
[<c170f6d9>] genl_rcv_msg+0x219/0x3c0
[<c170f4c0>] ? genl_rcv+0x30/0x30
[<c170ee7e>] netlink_rcv_skb+0x8e/0xb0
[<c170f4ac>] genl_rcv+0x1c/0x30
[<c170e8aa>] netlink_unicast+0x13a/0x1d0
[<c170ec18>] netlink_sendmsg+0x2d8/0x390
[<c16c5acd>] sock_sendmsg+0x2d/0x40
[<c16c6369>] ___sys_sendmsg+0x1d9/0x1e0

Fixing this by allowing TDLS setup request only when we have completed
association.

Signed-off-by: Balaji Pothunoori <bpothuno@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent e91cbe1d

net/mac80211/cfg.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1478,6 +1478,10 @@ static int ieee80211_add_station(struct wiphy wiphy, struct net_device dev,
	if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))		if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))
	sta->sta.tdls = true;		sta->sta.tdls = true;

			if (sta->sta.tdls && sdata->vif.type == NL80211_IFTYPE_STATION &&
			!sdata->u.mgd.associated)
			return -EINVAL;

	err = sta_apply_parameters(local, sta, params);		err = sta_apply_parameters(local, sta, params);
	if (err) {		if (err) {
	sta_info_free(local, sta);		sta_info_free(local, sta);