Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: KgVAs35SFecEVkRkvLbTdL0iH88xTE3eDqmRr49bUU8HKYDfbu5QRy3Xu71V/8bJa7D2fBdYgD
 hGU4mt1KoW9g==
IronPort-SDR: kZSGt3HvOWfGalsxmklyQHNgZyEzZK60wW8pY+Ot5Hm7acUEUh8u5nQVjjAF2HySl1B1wx2/EW
 aKiDJv8ToMVQ==
Subject: Re: [PATCH v2] RDMA/rvt: Fix potential memory leak caused by
 rvt_alloc_rq
To:     Aditya Pakki <pakki001@umn.edu>
Cc:     kjlu@umn.edu, wu000273@umn.edu,
        Mike Marciniszyn <mike.marciniszyn@intel.com>,
        Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        "Michael J. Ruhl" <michael.j.ruhl@intel.com>,
        linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20200614041148.131983-1-pakki001@umn.edu>
From:   Dennis Dalessandro <dennis.dalessandro@intel.com>
Message-ID: <f2f0815a-7567-2f0a-a55b-d7684a5ce331@intel.com>
Date:   Tue, 16 Jun 2020 15:20:56 -0400
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.9.0
MIME-Version: 1.0
In-Reply-To: <20200614041148.131983-1-pakki001@umn.edu>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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 <pakki001@umn.edu>
> ---
> 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 <dennis.dalessandro@intel.com>