1 files changed, 39 insertions, 11 deletions

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 1c39d6a2e850..e74837824cea 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -233,25 +233,30 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
 
         switch (params->cipher) {
         case WLAN_CIPHER_SUITE_TKIP:
+                /* Extended Key ID can only be used with CCMP/GCMP ciphers */
+                if ((pairwise && key_idx) ||
+                    params->mode != NL80211_KEY_RX_TX)
+                        return -EINVAL;
+                break;
         case WLAN_CIPHER_SUITE_CCMP:
         case WLAN_CIPHER_SUITE_CCMP_256:
         case WLAN_CIPHER_SUITE_GCMP:
         case WLAN_CIPHER_SUITE_GCMP_256:
-                /* IEEE802.11-2016 allows only 0 and - when using Extended Key
-                 * ID - 1 as index for pairwise keys.
+                /* IEEE802.11-2016 allows only 0 and - when supporting
+                 * Extended Key ID - 1 as index for pairwise keys.
                  * @NL80211_KEY_NO_TX is only allowed for pairwise keys when
                  * the driver supports Extended Key ID.
                  * @NL80211_KEY_SET_TX can't be set when installing and
                  * validating a key.
                  */
-                if (params->mode == NL80211_KEY_NO_TX) {
-                        if (!wiphy_ext_feature_isset(&rdev->wiphy,
-                                                     NL80211_EXT_FEATURE_EXT_KEY_ID))
-                                return -EINVAL;
-                        else if (!pairwise || key_idx < 0 || key_idx > 1)
+                if ((params->mode == NL80211_KEY_NO_TX && !pairwise) ||
+                    params->mode == NL80211_KEY_SET_TX)
+                        return -EINVAL;
+                if (wiphy_ext_feature_isset(&rdev->wiphy,
+                                            NL80211_EXT_FEATURE_EXT_KEY_ID)) {
+                        if (pairwise && (key_idx < 0 || key_idx > 1))
                                 return -EINVAL;
-                } else if ((pairwise && key_idx) ||
-                           params->mode == NL80211_KEY_SET_TX) {
+                } else if (pairwise && key_idx) {
                         return -EINVAL;
                 }
                 break;
@@ -1697,7 +1702,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
         for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) {
                 num_interfaces += params->iftype_num[iftype];
                 if (params->iftype_num[iftype] > 0 &&
-                    !(wiphy->software_iftypes & BIT(iftype)))
+                    !cfg80211_iftype_allowed(wiphy, iftype, 0, 1))
                         used_iftypes |= BIT(iftype);
         }
 
@@ -1719,7 +1724,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
                         return -ENOMEM;
 
                 for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) {
-                        if (wiphy->software_iftypes & BIT(iftype))
+                        if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1))
                                 continue;
                         for (j = 0; j < c->n_limits; j++) {
                                 all_iftypes |= limits[j].types;
@@ -2072,3 +2077,26 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
         return max_vht_nss;
 }
 EXPORT_SYMBOL(ieee80211_get_vht_max_nss);
+
+bool cfg80211_iftype_allowed(struct wiphy *wiphy, enum nl80211_iftype iftype,
+                             bool is_4addr, u8 check_swif)
+
+{
+        bool is_vlan = iftype == NL80211_IFTYPE_AP_VLAN;
+
+        switch (check_swif) {
+        case 0:
+                if (is_vlan && is_4addr)
+                        return wiphy->flags & WIPHY_FLAG_4ADDR_AP;
+                return wiphy->interface_modes & BIT(iftype);
+        case 1:
+                if (!(wiphy->software_iftypes & BIT(iftype)) && is_vlan)
+                        return wiphy->flags & WIPHY_FLAG_4ADDR_AP;
+                return wiphy->software_iftypes & BIT(iftype);
+        default:
+                break;
+        }
+
+        return false;
+}
+EXPORT_SYMBOL(cfg80211_iftype_allowed);