Merge tag 'mac80211-next-for-davem-2015-02-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Last round of updates for net-next:
 * revert a patch that caused a regression with mesh userspace (Bob)
 * fix a number of suspend/resume related races
   (from Emmanuel, Luca and myself - we'll look at backporting later)
 * add software implementations for new ciphers (Jouni)
 * add a new ACPI ID for Broadcom's rfkill (Mika)
 * allow using netns FD for wireless (Vadim)
 * some other cleanups (various)

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 56 insertions, 12 deletions

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 0d1966d54aaa..6903dbdcb8c1 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -227,18 +227,32 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
         if (pairwise && !mac_addr)
                 return -EINVAL;
 
-        /*
-         * 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 specific
-         * ciphers this should be validated in the driver or hardware level
-         * - but 802.11i clearly specifies to use zero)
-         */
-        if (pairwise && key_idx &&
-            ((params->cipher == WLAN_CIPHER_SUITE_TKIP) ||
-             (params->cipher == WLAN_CIPHER_SUITE_CCMP) ||
-             (params->cipher == WLAN_CIPHER_SUITE_AES_CMAC)))
-                return -EINVAL;
+        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
+                 * specific ciphers this should be validated in the driver or
+                 * hardware level - but 802.11i clearly specifies to use zero)
+                 */
+                if (pairwise && key_idx)
+                        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;
+                break;
+        default:
+                break;
+        }
 
         switch (params->cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
@@ -253,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;
@@ -261,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,
@@ -280,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;