Commit 6c8b6e4a authored Sep 28, 2020 by Rajkumar Manoharan Committed by Johannes Berg Sep 28, 2020

nl80211: fix OBSS PD min and max offset validation

The SRG min and max offset won't present when SRG Information Present of
SR control field of Spatial Reuse Parameter Set element set to 0. Per
spec. IEEE802.11ax D7.0, SRG OBSS PD Min Offset ≤ SRG OBSS PD Max
Offset. Hence fix the constrain check to allow same values in both
offset and also call appropriate nla_get function to read the values.

Fixes: 796e90f4 ("cfg80211: add support for parsing OBBS_PD attributes")
Signed-off-by: Rajkumar Manoharan <rmanohar@codeaurora.org>
Link: https://lore.kernel.org/r/1601278091-20313-1-git-send-email-rmanohar@codeaurora.org

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 21439b65

net/wireless/nl80211.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -4857,16 +4857,14 @@ static int nl80211_parse_he_obss_pd(struct nlattr *attrs,
		if (err)
		return err;

		if (!tb[NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET] \|\|
		!tb[NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET])
		return -EINVAL;

		if (tb[NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET])
		he_obss_pd->min_offset =
		nla_get_u32(tb[NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET]);
		nla_get_u8(tb[NL80211_HE_OBSS_PD_ATTR_MIN_OFFSET]);
		if (tb[NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET])
		he_obss_pd->max_offset =
		nla_get_u32(tb[NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET]);
		nla_get_u8(tb[NL80211_HE_OBSS_PD_ATTR_MAX_OFFSET]);

		if (he_obss_pd->min_offset >= he_obss_pd->max_offset)
		if (he_obss_pd->min_offset > he_obss_pd->max_offset)
		return -EINVAL;

		he_obss_pd->enable = true;