s390/qeth: fixes 2019-10-08
Subsystems (4)
cover s390/qeth: fixes 2019-10-08
Hi Dave,
please apply the following two patches to your net tree.
Alexandra fixes two issues in the initialization code for vnicc cmds. One is an uninitialized variable when a cmd fails, the other that we wouldn't recover correctly if the device's supported features changed.
Thanks,
Julian
Alexandra Winter (2):
s390/qeth: Fix error handling during VNICC initialization s390/qeth: Fix initialization of vnicc cmd masks during set online
drivers/s390/net/qeth_l2_main.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 s390/qeth: Fix error handling during VNICC initialization
From: Alexandra Winter <[email protected]>
Smatch discovered the use of uninitialized variable sup_cmds in error paths.
--- drivers/s390/net/qeth_l2_main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_l2_main.c +7 -4
@@ -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) {u32 *timeout = &card->options.vnicc.learning_timeout; +bool enable, error = false;unsigned int chars_len, i;unsigned long chars_tmp;u32 sup_cmds, vnicc; -bool enable, error;QETH_CARD_TEXT (card,2 ,"vniccini" );/* 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 ;for_each_set_bit (i, &chars_tmp, chars_len) { 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 ) || !(sup_cmds &IPA_VNICC_GET_TIMEOUT )) 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; }/* enforce assumed default values and recover settings, if changed */ - error =qeth_l2_vnicc_recover_timeout (card,QETH_VNICC_LEARNING , - timeout); + error |=qeth_l2_vnicc_recover_timeout (card,QETH_VNICC_LEARNING , + timeout); chars_tmp = card->options.vnicc.wanted_chars ^QETH_VNICC_DEFAULT ; chars_tmp |=QETH_VNICC_BRIDGE_INVISIBLE ; chars_len =sizeof (card->options.vnicc.wanted_chars) *BITS_PER_BYTE ;
Signature · 1 line
2.17.1
PATCH 2/2 s390/qeth: Fix initialization of vnicc cmd masks during set online
In reply to Julian WiedmannFrom: Alexandra Winter <[email protected]>
Without this patch, a command bit in the supported commands mask is only ever set to unsupported during set online. If a command is ever marked as unsupported (e.g. because of error during qeth_l2_vnicc_query_cmds), subsequent successful initialization (offline/online) would not bring it back.
--- drivers/s390/net/qeth_l2_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_l2_main.c +8 -4
@@ -2049,11 +2049,15 @@ static void qeth_l2_vnicc_init(struct qeth_card *card) sup_cmds =0 ; error = true; } -if (!(sup_cmds &IPA_VNICC_SET_TIMEOUT ) || - !(sup_cmds &IPA_VNICC_GET_TIMEOUT )) +if ((sup_cmds &IPA_VNICC_SET_TIMEOUT ) && + (sup_cmds &IPA_VNICC_GET_TIMEOUT )) + card->options.vnicc.getset_timeout_sup |= vnicc; +else card->options.vnicc.getset_timeout_sup &= ~vnicc; -if (!(sup_cmds &IPA_VNICC_ENABLE ) || - !(sup_cmds &IPA_VNICC_DISABLE )) +if ((sup_cmds &IPA_VNICC_ENABLE ) && + (sup_cmds &IPA_VNICC_DISABLE )) + card->options.vnicc.set_char_sup |= vnicc; +else card->options.vnicc.set_char_sup &= ~vnicc; }/* enforce assumed default values and recover settings, if changed */
Signature · 1 line
2.17.1
Jakub Kicinski
AppliedQuoted 7 lines · Julian Wiedmann
Hi Dave,
please apply the following two patches to your net tree.
Alexandra fixes two issues in the initialization code for vnicc cmds. One is an uninitialized variable when a cmd fails, the other that we wouldn't recover correctly if the device's supported features changed.
Applied, and queued for stable.