Staging: rtl8192e: remove redundant null check on array alg
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>
This commit is contained in:
Родитель
f40c60db19
Коммит
1393f1bc11
|
@ -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);
|
||||
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;
|
||||
}
|
||||
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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче