1 files changed, 36 insertions, 0 deletions

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 08f136ad2ea5..919fee807dd9 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -230,6 +230,9 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
         switch (params->cipher) {
         case WLAN_CIPHER_SUITE_TKIP:
         case WLAN_CIPHER_SUITE_CCMP:
+        case WLAN_CIPHER_SUITE_CCMP_256:
+        case WLAN_CIPHER_SUITE_GCMP:
+        case WLAN_CIPHER_SUITE_GCMP_256:
                 /* Disallow pairwise keys with non-zero index unless it's WEP
                  * or a vendor specific cipher (because current deployments use
                  * pairwise WEP keys with non-zero indices and for vendor
@@ -240,6 +243,9 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
                         return -EINVAL;
                 break;
         case WLAN_CIPHER_SUITE_AES_CMAC:
+        case WLAN_CIPHER_SUITE_BIP_CMAC_256:
+        case WLAN_CIPHER_SUITE_BIP_GMAC_128:
+        case WLAN_CIPHER_SUITE_BIP_GMAC_256:
                 /* Disallow BIP (group-only) cipher as pairwise cipher */
                 if (pairwise)
                         return -EINVAL;
@@ -261,6 +267,18 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
                 if (params->key_len != WLAN_KEY_LEN_CCMP)
                         return -EINVAL;
                 break;
+        case WLAN_CIPHER_SUITE_CCMP_256:
+                if (params->key_len != WLAN_KEY_LEN_CCMP_256)
+                        return -EINVAL;
+                break;
+        case WLAN_CIPHER_SUITE_GCMP:
+                if (params->key_len != WLAN_KEY_LEN_GCMP)
+                        return -EINVAL;
+                break;
+        case WLAN_CIPHER_SUITE_GCMP_256:
+                if (params->key_len != WLAN_KEY_LEN_GCMP_256)
+                        return -EINVAL;
+                break;
         case WLAN_CIPHER_SUITE_WEP104:
                 if (params->key_len != WLAN_KEY_LEN_WEP104)
                         return -EINVAL;
@@ -269,6 +287,18 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
                 if (params->key_len != WLAN_KEY_LEN_AES_CMAC)
                         return -EINVAL;
                 break;
+        case WLAN_CIPHER_SUITE_BIP_CMAC_256:
+                if (params->key_len != WLAN_KEY_LEN_BIP_CMAC_256)
+                        return -EINVAL;
+                break;
+        case WLAN_CIPHER_SUITE_BIP_GMAC_128:
+                if (params->key_len != WLAN_KEY_LEN_BIP_GMAC_128)
+                        return -EINVAL;
+                break;
+        case WLAN_CIPHER_SUITE_BIP_GMAC_256:
+                if (params->key_len != WLAN_KEY_LEN_BIP_GMAC_256)
+                        return -EINVAL;
+                break;
         default:
                 /*
                  * We don't know anything about this algorithm,
@@ -288,7 +318,13 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
                         return -EINVAL;
                 case WLAN_CIPHER_SUITE_TKIP:
                 case WLAN_CIPHER_SUITE_CCMP:
+                case WLAN_CIPHER_SUITE_CCMP_256:
+                case WLAN_CIPHER_SUITE_GCMP:
+                case WLAN_CIPHER_SUITE_GCMP_256:
                 case WLAN_CIPHER_SUITE_AES_CMAC:
+                case WLAN_CIPHER_SUITE_BIP_CMAC_256:
+                case WLAN_CIPHER_SUITE_BIP_GMAC_128:
+                case WLAN_CIPHER_SUITE_BIP_GMAC_256:
                         if (params->seq_len != 6)
                                 return -EINVAL;
                         break;