1 files changed, 30 insertions, 2 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 8a9b4d817ae6..ba439664c2e0 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4682,13 +4682,41 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
                 ibss.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
         }
 
-        ibss.channel = ieee80211_get_channel(wiphy,
-                nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]));
+        if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
+                enum nl80211_channel_type channel_type;
+
+                channel_type = nla_get_u32(
+                                info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
+                if (channel_type != NL80211_CHAN_NO_HT &&
+                    channel_type != NL80211_CHAN_HT20 &&
+                    channel_type != NL80211_CHAN_HT40MINUS &&
+                    channel_type != NL80211_CHAN_HT40PLUS)
+                        return -EINVAL;
+
+                if (channel_type != NL80211_CHAN_NO_HT &&
+                    !(wiphy->features & NL80211_FEATURE_HT_IBSS))
+                        return -EINVAL;
+
+                ibss.channel_type = channel_type;
+        } else {
+                ibss.channel_type = NL80211_CHAN_NO_HT;
+        }
+
+        ibss.channel = rdev_freq_to_chan(rdev,
+                nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
+                ibss.channel_type);
         if (!ibss.channel ||
             ibss.channel->flags & IEEE80211_CHAN_NO_IBSS ||
             ibss.channel->flags & IEEE80211_CHAN_DISABLED)
                 return -EINVAL;
 
+        /* Both channels should be able to initiate communication */
+        if ((ibss.channel_type == NL80211_CHAN_HT40PLUS ||
+             ibss.channel_type == NL80211_CHAN_HT40MINUS) &&
+            !cfg80211_can_beacon_sec_chan(&rdev->wiphy, ibss.channel,
+                                          ibss.channel_type))
+                return -EINVAL;
+
         ibss.channel_fixed = !!info->attrs[NL80211_ATTR_FREQ_FIXED];
         ibss.privacy = !!info->attrs[NL80211_ATTR_PRIVACY];