Commit 3dc27d25 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

nl80211: limit to one pairwise cipher for associate() 



In this case, only one cipher makes sense, unlike for
connect() where it may be possible to have the card or
driver select.

No changes to mac80211 due to the way the structs are
laid out -- but the loop in net/mac80211/cfg.c will
degrade to just zero or one passes.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4244f41a

net/wireless/nl80211.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -3119,7 +3119,8 @@ unlock_rtnl: 
}

}





static int nl80211_crypto_settings(struct genl_info *info,

static int nl80211_crypto_settings(struct genl_info *info,

				   struct cfg80211_crypto_settings *settings)

				   struct cfg80211_crypto_settings *settings,

				   int cipher_limit)

{

{

	settings->control_port = info->attrs[NL80211_ATTR_CONTROL_PORT];

	settings->control_port = info->attrs[NL80211_ATTR_CONTROL_PORT];
@@ -3134,7 +3135,7 @@ static int nl80211_crypto_settings(struct genl_info *info, 
		if (len % sizeof(u32))

		if (len % sizeof(u32))

			return -EINVAL;

			return -EINVAL;





		if (settings->n_ciphers_pairwise > NL80211_MAX_NR_CIPHER_SUITES)

		if (settings->n_ciphers_pairwise > cipher_limit)

			return -EINVAL;

			return -EINVAL;





		memcpy(settings->ciphers_pairwise, data, len);

		memcpy(settings->ciphers_pairwise, data, len);
@@ -3247,7 +3248,7 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info) 
		}

		}

	}

	}





	err = nl80211_crypto_settings(info, &crypto);

	err = nl80211_crypto_settings(info, &crypto, 1);

	if (!err)

	if (!err)

		err = cfg80211_mlme_assoc(rdev, dev, chan, bssid, ssid,

		err = cfg80211_mlme_assoc(rdev, dev, chan, bssid, ssid,

					  ssid_len, ie, ie_len, use_mfp,

					  ssid_len, ie, ie_len, use_mfp,
@@ -3652,7 +3653,8 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) 




	connect.privacy = info->attrs[NL80211_ATTR_PRIVACY];

	connect.privacy = info->attrs[NL80211_ATTR_PRIVACY];





	err = nl80211_crypto_settings(info, &connect.crypto);

	err = nl80211_crypto_settings(info, &connect.crypto,

				      NL80211_MAX_NR_CIPHER_SUITES);

	if (err)

	if (err)

		return err;

		return err;

	rtnl_lock();

	rtnl_lock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE