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

Commit 12d20fc9 authored by Purushottam Kushwaha's avatar Purushottam Kushwaha Committed by Johannes Berg
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.

Signed-off-by: default avatarPurushottam Kushwaha <pkushwah@qti.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7f8ed01e

net/wireless/nl80211.c

+9 −7
Original line number Diff line number Diff line
@@ -7752,12 +7752,13 @@ 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, ibss.beacon_interval);

	if (err)

		return err;



	if (!rdev->ops->join_ibss)

		return -EOPNOTSUPP;
@@ -9231,9 +9232,10 @@ 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, 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
@@ -1559,7 +1559,7 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev, 
	struct wireless_dev *wdev;

	int res = 0;



	if (!beacon_int)

	if (beacon_int < 10 || beacon_int > 10000)

		return -EINVAL;



	list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) {