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

Commit fe94f3a4 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Johannes Berg
Browse files

cfg80211: fix channel configuration in IBSS join 



When receiving an IBSS_JOINED event select the BSS object
based on the {bssid, channel} couple rather than the bssid
only.
With the current approach if another cell having the same
BSSID (but using a different channel) exists then cfg80211
picks up the wrong BSS object.
The result is a mismatching channel configuration between
cfg80211 and the driver, that can lead to any sort of
problem.

The issue can be triggered by having an IBSS sitting on
given channel and then asking the driver to create a new
cell using the same BSSID but with a different frequency.
By passing the channel to cfg80211_get_bss() we can solve
this ambiguity and retrieve/create the correct BSS object.
All the users of cfg80211_ibss_joined() have been changed
accordingly.

Moreover WARN when cfg80211_ibss_joined() gets a NULL
channel as argument and remove a bogus call of the same
function in ath6kl (it does not make sense to call
cfg80211_ibss_joined() with a zero BSSID on ibss-leave).

Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Arend van Spriel <arend@broadcom.com>
Cc: Bing Zhao <bzhao@marvell.com>
Cc: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Cc: libertas-dev@lists.infradead.org
Acked-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: default avatarAntonio Quartulli <antonio@open-mesh.com>
[minor code cleanup in ath6kl]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 67235cbc

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −6
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
	if (nw_type & ADHOC_NETWORK) {

		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",

			   nw_type & ADHOC_CREATOR ? "creator" : "joiner");

		cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);

		cfg80211_ibss_joined(vif->ndev, bssid, chan, GFP_KERNEL);

		cfg80211_put_bss(ar->wiphy, bss);

		return;

	}
@@ -861,15 +861,11 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason, 
	}



	if (vif->nw_type & ADHOC_NETWORK) {

		if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {

		if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC)

			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

				   "%s: ath6k not in ibss mode\n", __func__);

		return;

	}

		memset(bssid, 0, ETH_ALEN);

		cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);

		return;

	}



	if (vif->nw_type & INFRA_NETWORK) {

		if (vif->wdev.iftype != NL80211_IFTYPE_STATION &&

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+3 −1
Original line number Diff line number Diff line
@@ -4658,6 +4658,7 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, 
	struct brcmf_cfg80211_info *cfg = ifp->drvr->config;

	struct net_device *ndev = ifp->ndev;

	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;

	struct ieee80211_channel *chan;

	s32 err = 0;



	if (ifp->vif->mode == WL_MODE_AP) {
@@ -4665,9 +4666,10 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, 
	} else if (brcmf_is_linkup(e)) {

		brcmf_dbg(CONN, "Linkup\n");

		if (brcmf_is_ibssmode(ifp->vif)) {

			chan = ieee80211_get_channel(cfg->wiphy, cfg->channel);

			memcpy(profile->bssid, e->addr, ETH_ALEN);

			wl_inform_ibss(cfg, ndev, e->addr);

			cfg80211_ibss_joined(ndev, e->addr, GFP_KERNEL);

			cfg80211_ibss_joined(ndev, e->addr, chan, GFP_KERNEL);

			clear_bit(BRCMF_VIF_STATUS_CONNECTING,

				  &ifp->vif->sme_state);

			set_bit(BRCMF_VIF_STATUS_CONNECTED,

drivers/net/wireless/libertas/cfg.c

+2 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,8 @@ static void lbs_join_post(struct lbs_private *priv, 
	memcpy(priv->wdev->ssid, params->ssid, params->ssid_len);

	priv->wdev->ssid_len = params->ssid_len;



	cfg80211_ibss_joined(priv->dev, bssid, GFP_KERNEL);

	cfg80211_ibss_joined(priv->dev, bssid, params->chandef.chan,

			     GFP_KERNEL);



	/* TODO: consider doing this at MACREG_INT_CODE_LINK_SENSED time */

	priv->connect_status = LBS_CONNECTED;

drivers/net/wireless/mwifiex/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -1882,7 +1882,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, 
				     params->privacy);

done:

	if (!ret) {

		cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);

		cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,

				     params->chandef.chan, GFP_KERNEL);

		dev_dbg(priv->adapter->dev,

			"info: joined/created adhoc network with bssid"

			" %pM successfully\n", priv->cfg_bssid);

drivers/net/wireless/rndis_wlan.c

+3 −1
Original line number Diff line number Diff line
@@ -2835,7 +2835,9 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev) 
					bssid, req_ie, req_ie_len,

					resp_ie, resp_ie_len, GFP_KERNEL);

	} else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)

		cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);

		cfg80211_ibss_joined(usbdev->net, bssid,

				     get_current_channel(usbdev, NULL),

				     GFP_KERNEL);



	kfree(info);