openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

RDMA/qedr: Fix and simplify memory leak in PD alloc 

Free the PD if no internal resources were available. Move userspace
code under the relevant 'if'.

Signed-off-by: Ram Amrani <Ram.Amrani@cavium.com>
Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Ram Amrani 2017-01-24 13:51:42 +02:00 committed by Doug Ledford
parent af2b14b8b8
commit 9c1e0228ab
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/infiniband/hw/qedr/verbs.c
View File

@ -471,8 +471,6 @@ struct ib_pd *qedr_alloc_pd(struct ib_device *ibdev,
struct ib_ucontext *context, struct ib_udata *udata) struct ib_ucontext *context, struct ib_udata *udata)
{ {
struct qedr_dev *dev = get_qedr_dev(ibdev); struct qedr_dev *dev = get_qedr_dev(ibdev);
struct qedr_ucontext *uctx = NULL;
struct qedr_alloc_pd_uresp uresp;
struct qedr_pd *pd; struct qedr_pd *pd;
u16 pd_id; u16 pd_id;
int rc; int rc;
@ -489,21 +487,33 @@ struct ib_pd *qedr_alloc_pd(struct ib_device *ibdev,
if (!pd) if (!pd)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
dev->ops->rdma_alloc_pd(dev->rdma_ctx, &pd_id); rc = dev->ops->rdma_alloc_pd(dev->rdma_ctx, &pd_id);
if (rc)
goto err;
uresp.pd_id = pd_id;
pd->pd_id = pd_id; pd->pd_id = pd_id;
if (udata && context) { if (udata && context) {
struct qedr_alloc_pd_uresp uresp;
uresp.pd_id = pd_id;
rc = ib_copy_to_udata(udata, &uresp, sizeof(uresp)); rc = ib_copy_to_udata(udata, &uresp, sizeof(uresp));
if (rc) if (rc) {
DP_ERR(dev, "copy error pd_id=0x%x.\n", pd_id); DP_ERR(dev, "copy error pd_id=0x%x.\n", pd_id);
uctx = get_qedr_ucontext(context); dev->ops->rdma_dealloc_pd(dev->rdma_ctx, pd_id);
uctx->pd = pd; goto err;
pd->uctx = uctx; }
pd->uctx = get_qedr_ucontext(context);
pd->uctx->pd = pd;
} }
return &pd->ibpd; return &pd->ibpd;
err:
kfree(pd);
return ERR_PTR(rc);
} }
int qedr_dealloc_pd(struct ib_pd *ibpd) int qedr_dealloc_pd(struct ib_pd *ibpd)