From: Jason Gunthorpe <jgg@nvidia.com>
To: YueHaibing <yuehaibing@huawei.com>
Cc: bvanassche@acm.org, dledford@redhat.com,
linux-rdma@vger.kernel.org, target-devel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] IB/srpt: Fix passing zero to 'PTR_ERR'
Date: Thu, 12 Nov 2020 17:20:08 +0000 [thread overview]
Message-ID: <20201112172008.GA944848@nvidia.com> (raw)
In-Reply-To: <20201112145443.17832-1-yuehaibing@huawei.com>
On Thu, Nov 12, 2020 at 10:54:43PM +0800, YueHaibing wrote:
> Fix smatch warning:
>
> drivers/infiniband/ulp/srpt/ib_srpt.c:2341 srpt_cm_req_recv() warn: passing zero to 'PTR_ERR'
>
> Use PTR_ERR_OR_ZERO instead of PTR_ERR
>
> Fixes: 847462de3a0a ("IB/srpt: Fix srpt_cm_req_recv() error path (1/2)")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
> index 6be60aa5ffe2..3ff24b5048ac 100644
> +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
> @@ -2338,7 +2338,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
>
> if (IS_ERR_OR_NULL(ch->sess)) {
> WARN_ON_ONCE(ch->sess = NULL);
> - ret = PTR_ERR(ch->sess);
> + ret = PTR_ERR_OR_ZERO(ch->sess);
> ch->sess = NULL;
> pr_info("Rejected login for initiator %s: ret = %d.\n",
> ch->sess_name, ret);
I think it should be like this, Bart?
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 6017d525084a0c..80f9673956ced2 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2311,7 +2311,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
mutex_lock(&sport->port_guid_id.mutex);
list_for_each_entry(stpg, &sport->port_guid_id.tpg_list, entry) {
- if (!IS_ERR_OR_NULL(ch->sess))
+ if (ch->sess)
break;
ch->sess = target_setup_session(&stpg->tpg, tag_num,
tag_size, TARGET_PROT_NORMAL,
@@ -2321,12 +2321,12 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
mutex_lock(&sport->port_gid_id.mutex);
list_for_each_entry(stpg, &sport->port_gid_id.tpg_list, entry) {
- if (!IS_ERR_OR_NULL(ch->sess))
+ if (ch->sess)
break;
ch->sess = target_setup_session(&stpg->tpg, tag_num,
tag_size, TARGET_PROT_NORMAL, i_port_id,
ch, NULL);
- if (!IS_ERR_OR_NULL(ch->sess))
+ if (ch->sess)
break;
/* Retry without leading "0x" */
ch->sess = target_setup_session(&stpg->tpg, tag_num,
@@ -2335,7 +2335,9 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
}
mutex_unlock(&sport->port_gid_id.mutex);
- if (IS_ERR_OR_NULL(ch->sess)) {
+ if (!ch->sess)
+ ch->sess = ERR_PTR(-ENOENT);
+ if (IS_ERR(ch->sess)) {
WARN_ON_ONCE(ch->sess = NULL);
ret = PTR_ERR(ch->sess);
ch->sess = NULL;
next prev parent reply other threads:[~2020-11-12 17:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 14:54 [PATCH] IB/srpt: Fix passing zero to 'PTR_ERR' YueHaibing
2020-11-12 17:20 ` Jason Gunthorpe [this message]
2020-11-12 18:25 ` Bart Van Assche
2020-11-12 18:30 ` Jason Gunthorpe
2021-05-14 7:54 ` YueHaibing
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=20201112172008.GA944848@nvidia.com \
--to=jgg@nvidia.com \
--cc=bvanassche@acm.org \
--cc=dledford@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=target-devel@vger.kernel.org \
--cc=yuehaibing@huawei.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).