All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steve French <smfrench@gmail.com>
To: Long Li <longli@microsoft.com>
Cc: CIFS <linux-cifs@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [SMBDIRECT][PATCH] missing rc checks while waiting for SMB3 over RDMA events
Date: Mon, 21 Jun 2021 16:32:00 -0500	[thread overview]
Message-ID: <CAH2r5msOSLaZT42-jFMjJrB1YiYTZBzdM18ieqQY2v=YwXzcrA@mail.gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]

    There were two places where we weren't checking for error
    (e.g. ERESTARTSYS) while waiting for rdma resolution.

    Addresses-Coverity: 1462165 ("Unchecked return value")
   Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
index 10dfe5006792..ae07732f750f 100644
--- a/fs/cifs/smbdirect.c
+++ b/fs/cifs/smbdirect.c
@@ -572,8 +572,11 @@ static struct rdma_cm_id *smbd_create_id(
                log_rdma_event(ERR, "rdma_resolve_addr() failed %i\n", rc);
                goto out;
        }
-       wait_for_completion_interruptible_timeout(
+       rc = wait_for_completion_interruptible_timeout(
                &info->ri_done, msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT));
+       /* -ERESTARTSYS, returned when interrupted, is the only rc mentioned */
+       if (rc < 0)
+               goto out;
        rc = info->ri_rc;
        if (rc) {
                log_rdma_event(ERR, "rdma_resolve_addr() completed %i\n", rc);
@@ -586,8 +589,10 @@ static struct rdma_cm_id *smbd_create_id(
                log_rdma_event(ERR, "rdma_resolve_route() failed %i\n", rc);
                goto out;
        }
-       wait_for_completion_interruptible_timeout(
+       rc = wait_for_completion_interruptible_timeout(
                &info->ri_done, msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT));
+       if (rc < 0)  /* e.g. if interrupted and returns -ERESTARTSYS */
+               goto out
        rc = info->ri_rc;
        if (rc) {
                log_rdma_event(ERR, "rdma_resolve_route() completed %i\n", rc);


-- 
Thanks,

Steve

[-- Attachment #2: 0001-smbdirect-missing-rc-checks-while-waiting-for-rdma-e.patch --]
[-- Type: text/x-patch, Size: 1672 bytes --]

From 9bf42caeb95d8a5bf672348e5deba583f8233713 Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Mon, 21 Jun 2021 16:25:20 -0500
Subject: [PATCH] smbdirect: missing rc checks while waiting for rdma events

There were two places where we weren't checking for error
(e.g. ERESTARTSYS) while waiting for rdma resolution.

Addresses-Coverity: 1462165 ("Unchecked return value")
Signed-off-by: Steve French <stfrench@microsoft.com>
---
 fs/cifs/smbdirect.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
index 10dfe5006792..ae07732f750f 100644
--- a/fs/cifs/smbdirect.c
+++ b/fs/cifs/smbdirect.c
@@ -572,8 +572,11 @@ static struct rdma_cm_id *smbd_create_id(
 		log_rdma_event(ERR, "rdma_resolve_addr() failed %i\n", rc);
 		goto out;
 	}
-	wait_for_completion_interruptible_timeout(
+	rc = wait_for_completion_interruptible_timeout(
 		&info->ri_done, msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT));
+	/* -ERESTARTSYS, returned when interrupted, is the only rc mentioned */
+	if (rc < 0)
+		goto out;
 	rc = info->ri_rc;
 	if (rc) {
 		log_rdma_event(ERR, "rdma_resolve_addr() completed %i\n", rc);
@@ -586,8 +589,10 @@ static struct rdma_cm_id *smbd_create_id(
 		log_rdma_event(ERR, "rdma_resolve_route() failed %i\n", rc);
 		goto out;
 	}
-	wait_for_completion_interruptible_timeout(
+	rc = wait_for_completion_interruptible_timeout(
 		&info->ri_done, msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT));
+	if (rc < 0)  /* e.g. if interrupted and returns -ERESTARTSYS */
+		goto out
 	rc = info->ri_rc;
 	if (rc) {
 		log_rdma_event(ERR, "rdma_resolve_route() completed %i\n", rc);
-- 
2.30.2


             reply	other threads:[~2021-06-21 21:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-21 21:32 Steve French [this message]
2021-06-22  6:49 ` [SMBDIRECT][PATCH] missing rc checks while waiting for SMB3 over RDMA events Long Li
2021-06-22 15:18 ` Tom Talpey
2021-06-22 17:09   ` Steve French

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAH2r5msOSLaZT42-jFMjJrB1YiYTZBzdM18ieqQY2v=YwXzcrA@mail.gmail.com' \
    --to=smfrench@gmail.com \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=longli@microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.