Commit 5d087aa7 authored by Kieran Frewen's avatar Kieran Frewen Committed by Johannes Berg
Browse files

nl80211: validate S1G channel width 



Validate the S1G channel width input by user to ensure it matches
that of the requested channel

Signed-off-by: default avatarKieran Frewen <kieran.frewen@morsemicro.com>
Signed-off-by: default avatarBassem Dawood <bassem@morsemicro.com>
Link: https://lore.kernel.org/r/20220420041321.3788789-2-kieran.frewen@morsemicro.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5e469ed9

net/wireless/nl80211.c

+9 −0
Original line number Diff line number Diff line
@@ -3173,6 +3173,15 @@ int nl80211_parse_chandef(struct cfg80211_registered_device *rdev, 
	} else if (attrs[NL80211_ATTR_CHANNEL_WIDTH]) {

		chandef->width =

			nla_get_u32(attrs[NL80211_ATTR_CHANNEL_WIDTH]);

		if (chandef->chan->band == NL80211_BAND_S1GHZ) {

			/* User input error for channel width doesn't match channel  */

			if (chandef->width != ieee80211_s1g_channel_width(chandef->chan)) {

				NL_SET_ERR_MSG_ATTR(extack,

						    attrs[NL80211_ATTR_CHANNEL_WIDTH],

						    "bad channel width");

				return -EINVAL;

			}

		}

		if (attrs[NL80211_ATTR_CENTER_FREQ1]) {

			chandef->center_freq1 =

				nla_get_u32(attrs[NL80211_ATTR_CENTER_FREQ1]);