]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Staging: rtl8192e: remove redundant null check on array alg
authorColin Ian King <colin.king@canonical.com>
Thu, 9 Feb 2017 11:37:54 +0000 (11:37 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2017 14:06:44 +0000 (15:06 +0100)
u.crypt.alg is an array of u8 integers and hence the null check on
this array is redundant and can be removed.

Detected with CoverityScan, CID#146583 ("Array compared against 0")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtllib_softmac.c

index 1430ba27b0494803242f42bf9a2bc32ed9eddb2d..eeda17d6409b1c6901df93c49cddc0c7e9ba5651 100644 (file)
@@ -3365,23 +3365,21 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
        } else
                sec.flags &= ~SEC_ACTIVE_KEY;
 
-       if (param->u.crypt.alg != NULL) {
-               memcpy(sec.keys[param->u.crypt.idx],
-                      param->u.crypt.key,
-                      param->u.crypt.key_len);
-               sec.key_sizes[param->u.crypt.idx] = param->u.crypt.key_len;
-               sec.flags |= (1 << param->u.crypt.idx);
-
-               if (strcmp(param->u.crypt.alg, "R-WEP") == 0) {
-                       sec.flags |= SEC_LEVEL;
-                       sec.level = SEC_LEVEL_1;
-               } else if (strcmp(param->u.crypt.alg, "R-TKIP") == 0) {
-                       sec.flags |= SEC_LEVEL;
-                       sec.level = SEC_LEVEL_2;
-               } else if (strcmp(param->u.crypt.alg, "R-CCMP") == 0) {
-                       sec.flags |= SEC_LEVEL;
-                       sec.level = SEC_LEVEL_3;
-               }
+       memcpy(sec.keys[param->u.crypt.idx],
+              param->u.crypt.key,
+              param->u.crypt.key_len);
+       sec.key_sizes[param->u.crypt.idx] = param->u.crypt.key_len;
+       sec.flags |= (1 << param->u.crypt.idx);
+
+       if (strcmp(param->u.crypt.alg, "R-WEP") == 0) {
+               sec.flags |= SEC_LEVEL;
+               sec.level = SEC_LEVEL_1;
+       } else if (strcmp(param->u.crypt.alg, "R-TKIP") == 0) {
+               sec.flags |= SEC_LEVEL;
+               sec.level = SEC_LEVEL_2;
+       } else if (strcmp(param->u.crypt.alg, "R-CCMP") == 0) {
+               sec.flags |= SEC_LEVEL;
+               sec.level = SEC_LEVEL_3;
        }
  done:
        if (ieee->set_security)