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

Commit 9a27bdb5 authored by Purushottam Kushwaha's avatar Purushottam Kushwaha Committed by Lior David
Browse files

cfg80211: identically validate beacon interval for AP/MESH/IBSS 



Beacon interval interface combinations validation was missing
for MESH/IBSS join, add those.

Johannes: also move the beacon interval check disallowing really
tiny and really big intervals into the common function, which
adds it for AP mode.

CRs-Fixed: 1087922
Change-Id: I282300533dcd80f65c9ba366246d028a6130ffff
Signed-off-by: default avatarPurushottam Kushwaha <pkushwah@qti.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git


Git-commit: 12d20fc9186a742d40e824f575df5aa62be31d69
[liord@codeaurora.org: fix conflicts and trivial compile errors]
Signed-off-by: default avatarLior David <liord@codeaurora.org>
parent ed8559ea

net/wireless/nl80211.c

+12 −7
Original line number Diff line number Diff line
@@ -7770,12 +7770,14 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) 


	ibss.beacon_interval = 100;



	if (info->attrs[NL80211_ATTR_BEACON_INTERVAL]) {

	if (info->attrs[NL80211_ATTR_BEACON_INTERVAL])

		ibss.beacon_interval =

			nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);

		if (ibss.beacon_interval < 1 || ibss.beacon_interval > 10000)

			return -EINVAL;

	}



	err = cfg80211_validate_beacon_int(rdev, NL80211_IFTYPE_ADHOC,

					   ibss.beacon_interval);

	if (err)

		return err;



	if (!rdev->ops->join_ibss)

		return -EOPNOTSUPP;
@@ -9013,9 +9015,12 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info) 
	if (info->attrs[NL80211_ATTR_BEACON_INTERVAL]) {

		setup.beacon_interval =

			nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);

		if (setup.beacon_interval < 10 ||

		    setup.beacon_interval > 10000)

			return -EINVAL;



		err = cfg80211_validate_beacon_int(rdev,

						   NL80211_IFTYPE_MESH_POINT,

						   setup.beacon_interval);

		if (err)

			return err;

	}



	if (info->attrs[NL80211_ATTR_DTIM_PERIOD]) {

net/wireless/util.c

+1 −1
Original line number Diff line number Diff line
@@ -1490,7 +1490,7 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev, 
		.beacon_int_gcd = beacon_int,	/* GCD(n) = n */

	};



	if (!beacon_int)

	if (beacon_int < 10 || beacon_int > 10000)

		return -EINVAL;



	params.iftype_num[iftype] = 1;