cfg80211: Allow non-zero indexes for device specific pair-wise ciphers

Some vendor specific cipher suites require non-zero key indexes for pairwise
keys, but as of currently, the cfg80211 does not allow it.

As validating they cipher parameters for vendor specific cipher suites is the
job of the driver or hardware/firmware, change the cfg80211 to allow also
non-zero pairwise key indexes for vendor specific ciphers.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 4ed065d8bb515ae2594b113c9be34daa58895197..6a750bc6bcfe3cf3fddc82202a7d7ddeabf28720 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -167,12 +167,15 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
 
        /*
         * Disallow pairwise keys with non-zero index unless it's WEP
-        * (because current deployments use pairwise WEP keys with
-        * non-zero indizes but 802.11i clearly specifies to use zero)
+        * 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_WEP40 &&
-           params->cipher != WLAN_CIPHER_SUITE_WEP104)
+           ((params->cipher == WLAN_CIPHER_SUITE_TKIP) ||
+            (params->cipher == WLAN_CIPHER_SUITE_CCMP) ||
+            (params->cipher == WLAN_CIPHER_SUITE_AES_CMAC)))
                return -EINVAL;
 
        switch (params->cipher) {