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

Commit 579d7534 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: add missing braces 



Specifying a valid channel type will get
goto out rather than continuing, due to
missing braces. This affects both remain
on channel and action frame TX commands.

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

net/wireless/nl80211.c

+4 −2
Original line number Diff line number Diff line
@@ -4443,10 +4443,11 @@ static int nl80211_remain_on_channel(struct sk_buff *skb, 
		if (channel_type != NL80211_CHAN_NO_HT &&

		    channel_type != NL80211_CHAN_HT20 &&

		    channel_type != NL80211_CHAN_HT40PLUS &&

		    channel_type != NL80211_CHAN_HT40MINUS)

		    channel_type != NL80211_CHAN_HT40MINUS) {

			err = -EINVAL;

			goto out;

		}

	}



	freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);

	chan = rdev_freq_to_chan(rdev, freq, channel_type);
@@ -4717,10 +4718,11 @@ static int nl80211_action(struct sk_buff *skb, struct genl_info *info) 
		if (channel_type != NL80211_CHAN_NO_HT &&

		    channel_type != NL80211_CHAN_HT20 &&

		    channel_type != NL80211_CHAN_HT40PLUS &&

		    channel_type != NL80211_CHAN_HT40MINUS)

		    channel_type != NL80211_CHAN_HT40MINUS) {

			err = -EINVAL;

			goto out;

		}

	}



	freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);

	chan = rdev_freq_to_chan(rdev, freq, channel_type);