Skip to content

Commit 882b9e8

Browse files
committed
Merge: [s390] RHEL9.5 net/smc: avoid data corruption caused by decline
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4479 JIRA: https://issues.redhat.com/browse/RHEL-38236 CVE: CVE-2023-52775 Commits: e6d71b4 net/smc: avoid data corruption caused by decline Signed-off-by: Tobias Huschle <thuschle@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 992ab0f + b718ace commit 882b9e8

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

net/smc/af_smc.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,12 @@ static int smcr_clnt_conf_first_link(struct smc_sock *smc)
567567
struct smc_llc_qentry *qentry;
568568
int rc;
569569

570-
/* receive CONFIRM LINK request from server over RoCE fabric */
571-
qentry = smc_llc_wait(link->lgr, NULL, SMC_LLC_WAIT_TIME,
570+
/* Receive CONFIRM LINK request from server over RoCE fabric.
571+
* Increasing the client's timeout by twice as much as the server's
572+
* timeout by default can temporarily avoid decline messages of
573+
* both sides crossing or colliding
574+
*/
575+
qentry = smc_llc_wait(link->lgr, NULL, 2 * SMC_LLC_WAIT_TIME,
572576
SMC_LLC_CONFIRM_LINK);
573577
if (!qentry) {
574578
struct smc_clc_msg_decline dclc;

0 commit comments

Comments
 (0)