diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2018-07-10 10:31:59 -0700 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-07-13 11:58:45 -0600 |
| commit | 6869e0004fe16184acd6488f0c637e0081a84a8a (patch) | |
| tree | dc5e9137203d4d377a3d014cd00c548cded18c35 /drivers/infiniband/ulp/srpt/ib_srpt.c | |
| parent | 847462de3a0aabc5343a1e338537f69a03bb61af (diff) | |
| download | talos-obmc-linux-6869e0004fe16184acd6488f0c637e0081a84a8a.tar.gz talos-obmc-linux-6869e0004fe16184acd6488f0c637e0081a84a8a.zip | |
IB/srpt: Fix srpt_cm_req_recv() error path (2/2)
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>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/ulp/srpt/ib_srpt.c')
| -rw-r--r-- | drivers/infiniband/ulp/srpt/ib_srpt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index 6b86f5c71847..8bd7373cb828 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -2360,8 +2360,11 @@ free_ring: 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; |
