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: FRsNhMB74VnO045WCbNsHPP4QxTn8jIyrodjPs3ZyurCXCHD7LaFL5mwpubbVltvZ9bugmx+3L
 v05F4hOx29Yg==
IronPort-SDR: sS9wkkOWP2IUuMY4gT3haiEa8VbnO9eTSK1mP/sr8WNa23DWL1nHQGbxoxvZapa5nBX+UhuSmo
 1GNSmG5BWQqg==
Subject: Re: [PATCH] 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>, linux-rdma@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20200612195426.54133-1-pakki001@umn.edu>
From:   Dennis Dalessandro <dennis.dalessandro@intel.com>
Message-ID: <4db8021d-b5a8-448e-4d8d-c8ea91f19daa@intel.com>
Date:   Sat, 13 Jun 2020 13:24:50 -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: <20200612195426.54133-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/12/2020 3:54 PM, Aditya Pakki wrote:
> In case of failure of alloc_ud_wq_attr, the memory allocated by
> rvt_alloc_rq() is not freed. The patch fixes this issue by
> calling rvt_free_rq().
> 
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
>   drivers/infiniband/sw/rdmavt/qp.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
> index 511b72809e14..17ea7da73bf9 100644
> --- a/drivers/infiniband/sw/rdmavt/qp.c
> +++ b/drivers/infiniband/sw/rdmavt/qp.c
> @@ -1203,6 +1203,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
>   			qp->s_flags = RVT_S_SIGNAL_REQ_WR;
>   		err = alloc_ud_wq_attr(qp, rdi->dparms.node);
>   		if (err) {
> +			rvt_free_rq(&qp->r_rq);
>   			ret = (ERR_PTR(err));
>   			goto bail_driver_priv;
>   		}
> 

This should probably use the unwind code at the end to be consistent.

Looks like the rvt_free_rq and free_ud_wq_attr have gotten out of order 
and shouldn't be tied together, so that needs fixed up too.

I'd need to study the git log a little more to see what happened but I 
think d310c4bf8aea ("IB/{rdmavt, hfi1, qib}: Remove AH refcount for UD 
QPs") just missed this.

-Denny