2020-06-14 04:14:08

by Aditya Pakki

Subject: [PATCH v2] RDMA/rvt: Fix potential memory leak caused by rvt_alloc_rq

In case of failure of alloc_ud_wq_attr(), the memory allocated by
rvt_alloc_rq() is not freed. Fix it by calling rvt_free_rq() using
the existing clean-up code.

Fixes: d310c4bf8aea ("IB/{rdmavt, hfi1, qib}: Remove AH refcount for UD QPs")
Signed-off-by: Aditya Pakki <[email protected]>
---
v1: Fix incorrect order of rvt_free_rq and free_ud_wq_attr.
Suggested by Dennis Dalessandro.
---
drivers/infiniband/sw/rdmavt/qp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 511b72809e14..7db35dd6ad74 100644
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -1204,7 +1204,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
err = alloc_ud_wq_attr(qp, rdi->dparms.node);
if (err) {
ret = (ERR_PTR(err));
- goto bail_driver_priv;
+ goto bail_rq_rvt;
}

if (init_attr->create_flags & IB_QP_CREATE_NETDEV_USE)
@@ -1314,9 +1314,11 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
rvt_free_qpn(&rdi->qp_dev->qpn_table, qp->ibqp.qp_num);

bail_rq_wq:
- rvt_free_rq(&qp->r_rq);
free_ud_wq_attr(qp);

+bail_rq_rvt:
+ rvt_free_rq(&qp->r_rq);
+
bail_driver_priv:
rdi->driver_f.qp_priv_free(rdi, qp);

--
2.25.1

2020-06-16 19:26:50

by Dennis Dalessandro

Subject: Re: [PATCH v2] RDMA/rvt: Fix potential memory leak caused by rvt_alloc_rq

On 6/14/2020 12:11 AM, Aditya Pakki wrote:
> In case of failure of alloc_ud_wq_attr(), the memory allocated by
> rvt_alloc_rq() is not freed. Fix it by calling rvt_free_rq() using
> the existing clean-up code.
>
> Fixes: d310c4bf8aea ("IB/{rdmavt, hfi1, qib}: Remove AH refcount for UD QPs")
> Signed-off-by: Aditya Pakki <[email protected]>
> ---
> v1: Fix incorrect order of rvt_free_rq and free_ud_wq_attr.
> Suggested by Dennis Dalessandro.
> ---
> drivers/infiniband/sw/rdmavt/qp.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
> index 511b72809e14..7db35dd6ad74 100644
> --- a/drivers/infiniband/sw/rdmavt/qp.c
> +++ b/drivers/infiniband/sw/rdmavt/qp.c
> @@ -1204,7 +1204,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
> err = alloc_ud_wq_attr(qp, rdi->dparms.node);
> if (err) {
> ret = (ERR_PTR(err));
> - goto bail_driver_priv;
> + goto bail_rq_rvt;
> }
>
> if (init_attr->create_flags & IB_QP_CREATE_NETDEV_USE)
> @@ -1314,9 +1314,11 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
> rvt_free_qpn(&rdi->qp_dev->qpn_table, qp->ibqp.qp_num);
>
> bail_rq_wq:
> - rvt_free_rq(&qp->r_rq);
> free_ud_wq_attr(qp);
>
> +bail_rq_rvt:
> + rvt_free_rq(&qp->r_rq);
> +
> bail_driver_priv:
> rdi->driver_f.qp_priv_free(rdi, qp);
>
>

Cool thanks.

Acked-by: Dennis Dalessandro <[email protected]>

2020-06-18 12:48:33

by Jason Gunthorpe

Subject: Re: [PATCH v2] RDMA/rvt: Fix potential memory leak caused by rvt_alloc_rq

On Sat, Jun 13, 2020 at 11:11:48PM -0500, Aditya Pakki wrote:
> In case of failure of alloc_ud_wq_attr(), the memory allocated by
> rvt_alloc_rq() is not freed. Fix it by calling rvt_free_rq() using
> the existing clean-up code.
>
> Fixes: d310c4bf8aea ("IB/{rdmavt, hfi1, qib}: Remove AH refcount for UD QPs")
> Signed-off-by: Aditya Pakki <[email protected]>
> Acked-by: Dennis Dalessandro <[email protected]>
> ---
> v1: Fix incorrect order of rvt_free_rq and free_ud_wq_attr.
> Suggested by Dennis Dalessandro.
> ---
> drivers/infiniband/sw/rdmavt/qp.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)

Applied to for-rc, thanks

Jason