From: Bart Van Assche <bvanassche@acm.org>
To: Jason Gunthorpe <jgg@nvidia.com>, YueHaibing <yuehaibing@huawei.com>
Cc: 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 10:25:48 -0800 [thread overview]
Message-ID: <c73d9be0-0bd8-634a-e3d1-c81fe4c30482@acm.org> (raw)
In-Reply-To: <20201112172008.GA944848@nvidia.com>
On 11/12/20 9:20 AM, Jason Gunthorpe wrote:
> 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;
>
Hi Jason,
The ib_srpt driver accepts three different formats for the initiator
ACL. Up to two of the three target_setup_session() calls will fail if
the fifth argument of target_setup_session() does not use the format of
the initiator ID in configfs. If the first or the second
target_setup_session() call fails it is essential that later
target_setup_session() calls happen. Hence the IS_ERR_OR_NULL(ch->sess)
checks in the above loops.
In other words, I like YueHaibing's patch better.
Thanks,
Bart.
next prev parent reply other threads:[~2020-11-12 18:25 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
2020-11-12 18:25 ` Bart Van Assche [this message]
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=c73d9be0-0bd8-634a-e3d1-c81fe4c30482@acm.org \
--to=bvanassche@acm.org \
--cc=dledford@redhat.com \
--cc=jgg@nvidia.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).