UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390/qeth: Fix error handling during VNICC initialization 

Smatch discovered the use of uninitialized variable sup_cmds
in error paths.

Fixes: caa1f0b10d ("s390/qeth: add VNICC enable/disable support")
Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
This commit is contained in:
Alexandra Winter 2019-10-08 18:21:06 +02:00 committed by Jakub Kicinski
parent 9db74e51ec
commit b528965bcc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/s390/net/qeth_l2_main.c
View File

@ -2021,10 +2021,10 @@ static bool qeth_l2_vnicc_recover_char(struct qeth_card *card, u32 vnicc,
static void qeth_l2_vnicc_init(struct qeth_card *card) static void qeth_l2_vnicc_init(struct qeth_card *card)
{ {
u32 *timeout = &card->options.vnicc.learning_timeout; u32 *timeout = &card->options.vnicc.learning_timeout;
bool enable, error = false;
unsigned int chars_len, i; unsigned int chars_len, i;
unsigned long chars_tmp; unsigned long chars_tmp;
u32 sup_cmds, vnicc; u32 sup_cmds, vnicc;
bool enable, error;
QETH_CARD_TEXT(card, 2, "vniccini"); QETH_CARD_TEXT(card, 2, "vniccini");
/* reset rx_bcast */ /* reset rx_bcast */
@ -2045,7 +2045,10 @@ static void qeth_l2_vnicc_init(struct qeth_card *card)
chars_len = sizeof(card->options.vnicc.sup_chars) * BITS_PER_BYTE; chars_len = sizeof(card->options.vnicc.sup_chars) * BITS_PER_BYTE;
for_each_set_bit(i, &chars_tmp, chars_len) { for_each_set_bit(i, &chars_tmp, chars_len) {
vnicc = BIT(i); vnicc = BIT(i);
qeth_l2_vnicc_query_cmds(card, vnicc, &sup_cmds); if (qeth_l2_vnicc_query_cmds(card, vnicc, &sup_cmds)) {
sup_cmds = 0;
error = true;
}
if (!(sup_cmds & IPA_VNICC_SET_TIMEOUT) || if (!(sup_cmds & IPA_VNICC_SET_TIMEOUT) ||
!(sup_cmds & IPA_VNICC_GET_TIMEOUT)) !(sup_cmds & IPA_VNICC_GET_TIMEOUT))
card->options.vnicc.getset_timeout_sup &= ~vnicc; card->options.vnicc.getset_timeout_sup &= ~vnicc;
@ -2054,8 +2057,8 @@ static void qeth_l2_vnicc_init(struct qeth_card *card)
card->options.vnicc.set_char_sup &= ~vnicc; card->options.vnicc.set_char_sup &= ~vnicc;
} }
/* enforce assumed default values and recover settings, if changed */ /* enforce assumed default values and recover settings, if changed */
error = qeth_l2_vnicc_recover_timeout(card, QETH_VNICC_LEARNING, error |= qeth_l2_vnicc_recover_timeout(card, QETH_VNICC_LEARNING,
timeout); timeout);
chars_tmp = card->options.vnicc.wanted_chars ^ QETH_VNICC_DEFAULT; chars_tmp = card->options.vnicc.wanted_chars ^ QETH_VNICC_DEFAULT;
chars_tmp |= QETH_VNICC_BRIDGE_INVISIBLE; chars_tmp |= QETH_VNICC_BRIDGE_INVISIBLE;
chars_len = sizeof(card->options.vnicc.wanted_chars) * BITS_PER_BYTE; chars_len = sizeof(card->options.vnicc.wanted_chars) * BITS_PER_BYTE;