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;
From:   Michal Kalderon <mkalderon@marvell.com>
To:     Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
CC:     "takafumi@sslab.ics.keio.ac.jp" <takafumi@sslab.ics.keio.ac.jp>,
        "Ariel Elior" <aelior@marvell.com>,
        Doug Ledford <dledford@redhat.com>,
        "Jason Gunthorpe" <jgg@ziepe.ca>,
        Yuval Bason <yuval.bason@cavium.com>,
        "linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [EXT] [PATCH v3] qedr: fix resource leak in qedr_create_qp
Thread-Topic: [EXT] [PATCH v3] qedr: fix resource leak in qedr_create_qp
Thread-Index: AQHWiDpkaTjQLSAW0EKfdzH4wvIvh6lpRgvw
Date:   Tue, 15 Sep 2020 06:41:50 +0000
Message-ID: <MN2PR18MB3182462A13AED5F457796841A1200@MN2PR18MB3182.namprd18.prod.outlook.com>
References: <AEYrHjmsd4Sp2R54y55pVL3CXr1KXedoBnTEczCBkpE9+SsFNg@mail.gmail.com>
 <20200911125159.4577-1-keitasuzuki.park@sslab.ics.keio.ac.jp>
In-Reply-To: <20200911125159.4577-1-keitasuzuki.park@sslab.ics.keio.ac.jp>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: c6dff315-cbc9-4dfd-d012-08d859426d65
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Sep 2020 06:41:50.8948
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Zr9UtZRdIm6zvltDFW1QBngFjRqbmdmzoDVVB7nz2lMNVYhyy2+3PseNDpu3wBVNPS57IS1Dn010jXOcrxGvoA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR18MB2193
X-OriginatorOrg: marvell.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687
 definitions=2020-09-15_04:2020-09-15,2020-09-15 signatures=0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> From: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
> Sent: Friday, September 11, 2020 3:52 PM
> When xa_insert() fails, the acquired resource in qedr_create_qp should al=
so
> be freed. However, current implementation does not handle the error.
>=20
> Fix this by adding a new goto label that calls qedr_free_qp_resources.
>=20
> Fixes: 1212767e23bb ("qedr: Add wrapping generic structure for qpidr and
> adjust idr routines.")
> Signed-off-by: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
> ---
> changelog(v3): Fix linebreak of the fix tag
> changelog(v2): Change numbered labels to descriptive labels
>=20
>  drivers/infiniband/hw/qedr/verbs.c | 52 ++++++++++++++++--------------
>  1 file changed, 27 insertions(+), 25 deletions(-)
>=20
> diff --git a/drivers/infiniband/hw/qedr/verbs.c
> b/drivers/infiniband/hw/qedr/verbs.c
> index b49bef94637e..3b4c84f67023 100644
> --- a/drivers/infiniband/hw/qedr/verbs.c
> +++ b/drivers/infiniband/hw/qedr/verbs.c
> @@ -2112,6 +2112,28 @@ static int qedr_create_kernel_qp(struct qedr_dev
> *dev,
>  	return rc;
>  }
>=20
> +static int qedr_free_qp_resources(struct qedr_dev *dev, struct qedr_qp
> *qp,
> +				  struct ib_udata *udata)
> +{
> +	struct qedr_ucontext *ctx =3D
> +		rdma_udata_to_drv_context(udata, struct qedr_ucontext,
> +					  ibucontext);
> +	int rc;
> +
> +	if (qp->qp_type !=3D IB_QPT_GSI) {
> +		rc =3D dev->ops->rdma_destroy_qp(dev->rdma_ctx, qp-
> >qed_qp);
> +		if (rc)
> +			return rc;
> +	}
> +
> +	if (qp->create_type =3D=3D QEDR_QP_CREATE_USER)
> +		qedr_cleanup_user(dev, ctx, qp);
> +	else
> +		qedr_cleanup_kernel(dev, qp);
> +
> +	return 0;
> +}
> +
>  struct ib_qp *qedr_create_qp(struct ib_pd *ibpd,
>  			     struct ib_qp_init_attr *attrs,
>  			     struct ib_udata *udata)
> @@ -2158,19 +2180,21 @@ struct ib_qp *qedr_create_qp(struct ib_pd
> *ibpd,
>  		rc =3D qedr_create_kernel_qp(dev, qp, ibpd, attrs);
>=20
>  	if (rc)
> -		goto err;
> +		goto out_free_qp;
>=20
>  	qp->ibqp.qp_num =3D qp->qp_id;
>=20
>  	if (rdma_protocol_iwarp(&dev->ibdev, 1)) {
>  		rc =3D xa_insert(&dev->qps, qp->qp_id, qp, GFP_KERNEL);
>  		if (rc)
> -			goto err;
> +			goto out_free_qp_resources;
>  	}
>=20
>  	return &qp->ibqp;
>=20
> -err:
> +out_free_qp_resources:
> +	qedr_free_qp_resources(dev, qp, udata);
> +out_free_qp:
>  	kfree(qp);
>=20
>  	return ERR_PTR(-EFAULT);
> @@ -2671,28 +2695,6 @@ int qedr_query_qp(struct ib_qp *ibqp,
>  	return rc;
>  }
>=20
> -static int qedr_free_qp_resources(struct qedr_dev *dev, struct qedr_qp
> *qp,
> -				  struct ib_udata *udata)
> -{
> -	struct qedr_ucontext *ctx =3D
> -		rdma_udata_to_drv_context(udata, struct qedr_ucontext,
> -					  ibucontext);
> -	int rc;
> -
> -	if (qp->qp_type !=3D IB_QPT_GSI) {
> -		rc =3D dev->ops->rdma_destroy_qp(dev->rdma_ctx, qp-
> >qed_qp);
> -		if (rc)
> -			return rc;
> -	}
> -
> -	if (qp->create_type =3D=3D QEDR_QP_CREATE_USER)
> -		qedr_cleanup_user(dev, ctx, qp);
> -	else
> -		qedr_cleanup_kernel(dev, qp);
> -
> -	return 0;
> -}
> -
>  int qedr_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)  {
>  	struct qedr_qp *qp =3D get_qedr_qp(ibqp);
> --
> 2.17.1

Thanks,=A0

Acked-by: Michal Kalderon=A0<michal.kalderon@marvell.com>