From: Bart Van Assche <bart.vanassche@wdc.com>
To: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Doug Ledford <dledford@redhat.com>,
linux-rdma@vger.kernel.org,
Bart Van Assche <bart.vanassche@wdc.com>,
stable@vger.kernel.org
Subject: [PATCH 2/3] IB/srpt: Fix srpt_cm_req_recv() error path (2/2)
Date: Tue, 10 Jul 2018 10:31:59 -0700 [thread overview]
Message-ID: <20180710173200.19853-3-bart.vanassche@wdc.com> (raw)
In-Reply-To: <20180710173200.19853-1-bart.vanassche@wdc.com>
If a login request was received through the RDMA/CM and if an
error occurs during login, clear rdma_cm_id->context instead of
ib_cm_id->context.
Fixes: 63cf1a902c9d ("IB/srpt: Add RDMA/CM support")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: <stable@vger.kernel.org>
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index e95d0c1c0652..325bae29e90d 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2361,8 +2361,11 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_ring,
ch->sport->sdev, ch->rq_size,
ch->max_rsp_size, DMA_TO_DEVICE);
+
free_ch:
- if (ib_cm_id)
+ if (rdma_cm_id)
+ rdma_cm_id->context = NULL;
+ else
ib_cm_id->context = NULL;
kfree(ch);
ch = NULL;
--
2.18.0
next prev parent reply other threads:[~2018-07-10 17:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180710173200.19853-1-bart.vanassche@wdc.com>
2018-07-10 17:31 ` [PATCH 1/3] IB/srpt: Fix srpt_cm_req_recv() error path (1/2) Bart Van Assche
2018-07-10 17:31 ` Bart Van Assche [this message]
2018-07-10 17:32 ` [PATCH 3/3] IB/srpt: Fix a use-after-free Bart Van Assche
2018-07-10 18:38 ` Jason Gunthorpe
2018-07-10 20:19 ` Bart Van Assche
2018-07-10 21:36 ` Jason Gunthorpe
2018-07-10 18:51 ` Greg KH
2018-07-10 20:23 ` Bart Van Assche
2018-07-10 20:44 ` gregkh
2018-07-10 21:02 ` Bart Van Assche
2018-07-11 9:45 ` gregkh
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=20180710173200.19853-3-bart.vanassche@wdc.com \
--to=bart.vanassche@wdc.com \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=linux-rdma@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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