Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Michal Kalderon <mkalderon@marvell.com>
To:     Jianglei Nie <niejianglei2021@163.com>,
        Ariel Elior <aelior@marvell.com>,
        "jgg@ziepe.ca" <jgg@ziepe.ca>, "leon@kernel.org" <leon@kernel.org>
CC:     "linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [EXT] [PATCH] RDMA/qedr: Fix potential memory leak in
 __qedr_alloc_mr()
Thread-Topic: [EXT] [PATCH] RDMA/qedr: Fix potential memory leak in
 __qedr_alloc_mr()
Thread-Index: AQHYl0khiwQearHL+UiF9wPULANmRa19pyMA
Date:   Thu, 14 Jul 2022 10:17:38 +0000
Message-ID: <CH0PR18MB41299978AED8B666E5CC7F79A1889@CH0PR18MB4129.namprd18.prod.outlook.com>
References: <20220714061505.2342759-1-niejianglei2021@163.com>
In-Reply-To: <20220714061505.2342759-1-niejianglei2021@163.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?C0LM9LGGaI5X5WhLKEP5bzN0RnwbNgjWuX5xoDiWR9xaucX3hgCsti9I8v?=
 =?iso-8859-1?Q?cURlvLVg55sUK7XeFLA3MOm9Ua2BUBoSJ41G8eRv5qzoZY7Fsj0j2/Kkg7?=
 =?iso-8859-1?Q?/8FFqxciEcOacGJRcWLRbFl6TyrKb5ifpRels6oVNloFChqerJsScguTsT?=
 =?iso-8859-1?Q?UnY71lCHVOqnbIZv5X8DE87kvFWLXwcA1t/qviidMJsL0dVYETfbo85/GY?=
 =?iso-8859-1?Q?fjKI3mUi9WhcP7HNNceTFYRJ6DH62ZSLiIQIUy8dr90cUbEeiqPNEP7XvU?=
 =?iso-8859-1?Q?cqOYqJgYwOSdqErpe10SAnajKOUA3ZlYQ3tFV1kuliUWzGDhbWz1nuhmKy?=
 =?iso-8859-1?Q?DL4L0c2rzb7QbkqZHq3CaNUlBkxFIYTz4ltkBATpByeIDS/1Hed0AWMe6P?=
 =?iso-8859-1?Q?a6MrZGs5AWmIu7a5ai/S7pIGvh8nAlrNjKm5GdLV1KlIYUE3xQKjP053gL?=
 =?iso-8859-1?Q?qZ0wVzaWcWYWEXsQbOIgvwHL4Mfq5nShaAW/C0YPyZ3iGImyl8+irH/Rww?=
 =?iso-8859-1?Q?uw3N/hF9sQTr4AE/jao50kFiYpReKgyjdG3Y+Zmbs5Sw3E2r9PZs1SGg+C?=
 =?iso-8859-1?Q?SEDKT/tejy+qDSvMgBkAZAf68k9jRSPeLnL9assXCzXaNHubdVyWKlNjMw?=
 =?iso-8859-1?Q?KVk+wmUMdJtIJnJpIqSNrVpVWBAGCNUSZT8UZwaO3V46r6qiKBO2FiNNQ6?=
 =?iso-8859-1?Q?e9HI25EdgC73Vy/WP9HgUkv5nXEivriNYVHUvTTvnwuVJL29TEFlXawweP?=
 =?iso-8859-1?Q?v5gTph1ZR0NvGvEAFRcPgEMCnQAvgXBWYHsR6EuEB2UUy21K8V4Fa5Kj3J?=
 =?iso-8859-1?Q?CQjX4OK+BdiPxHL5HTOpnISynh0ZHyI432DTY8eau7mbCzkgx84JTDg4lA?=
 =?iso-8859-1?Q?NXPTG9IBElwavhUVvMwAFWrNjFw2Segax4mDjb8LIopsSmaz2TTK2nCF/X?=
 =?iso-8859-1?Q?rjN/lJhV5GZQkR3zWa6zO7s3j3MJRRY+s0HTFUA3BZiaixLpYXVv76QDZv?=
 =?iso-8859-1?Q?n8RySfv/9Yan1AnS4EDWL8TzcJoZOBt1IMIp6OA9F+UxGRYBrmaVwSprRF?=
 =?iso-8859-1?Q?V8V7UuspJ3EgcCOALA4szGhjSuxJC0PwgN1l3EqqJTB3AGRiAU2CFSj+h3?=
 =?iso-8859-1?Q?t+QVL4gyZazM1ebcDXdRDjIHkLD4/rjydPgjqKFXSKIWHAytVpUomnlMhQ?=
 =?iso-8859-1?Q?WZsfhiSVJzpYpIYaolP9yKlwEdzDth8BVYVBzgQJcnrrpMbAbbCUcdSs79?=
 =?iso-8859-1?Q?HYPifl8WamkZ7w6WRv9ln4o5vtey09TAehTrRWA7XVrdTKmKKFPypY7Pbm?=
 =?iso-8859-1?Q?PJV4uGfori7R1zAyXutyOlzfyzUwS7kxvTKup66OKp+SPuaXLs2Wv67arA?=
 =?iso-8859-1?Q?ZxqzePTwI4p/jP9pRnWBWXDejARZEs95vRZSv3X5B5uUETM2pwMq+yTAhB?=
 =?iso-8859-1?Q?sxRmzGaU+QQX+5JwQi9baTsUZL2aRBOZN2CJhAerI2P4Z7KSfQC5fAKdXN?=
 =?iso-8859-1?Q?9wWJ6LbmQg7J2M27JfDzFkfcqGp3VrVZ1XU+CDPgliTzpb2c1qWJ6KIwsE?=
 =?iso-8859-1?Q?9+b/GoC61f1Zo/X3ILHB0/6Wc+0OCSK1opkPcp7uctYZ8F6tMYH4YPk2+6?=
 =?iso-8859-1?Q?pS90oJmc5+SyRaw4L7b4eYFEoHtt14vXw2?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: marvell.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CH0PR18MB4129.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fc214376-c072-47e4-1699-08da6582140b
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jul 2022 10:17:38.2303
 (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: Gw3KWULgjyRF+7PB0XtN0w5mQO4XCispOC1DF2vz/gcjm5lOELMEYOZLN9SRrOS/7O2CUS/CyFLqevhnIBQeAw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR18MB2151
X-Proofpoint-GUID: dPK2nUsVF4ioe0TZnUzcNkImlKbmhW0O
X-Proofpoint-ORIG-GUID: dPK2nUsVF4ioe0TZnUzcNkImlKbmhW0O
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-14_08,2022-07-14_01,2022-06-22_01
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> From: Jianglei Nie <niejianglei2021@163.com>
> Sent: Thursday, July 14, 2022 9:15 AM
> ----------------------------------------------------------------------
> __qedr_alloc_mr() allocates a memory chunk for "mr->info.pbl_table" with
> init_mr_info(). When rdma_alloc_tid() and rdma_register_tid() fail, "mr"
> is released while "mr->info.pbl_table" is not released, which will lead
> to a memory leak.
>=20
> We should release the "mr->info.pbl_table" with qedr_free_pbl() when
> error
> occurs to fix the memory leak.
>=20
> Signed-off-by: Jianglei Nie <niejianglei2021@163.com>
> ---
>  drivers/infiniband/hw/qedr/verbs.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>=20
> diff --git a/drivers/infiniband/hw/qedr/verbs.c
> b/drivers/infiniband/hw/qedr/verbs.c
> index 03ed7c0fae50..d745ce9dc88a 100644
> --- a/drivers/infiniband/hw/qedr/verbs.c
> +++ b/drivers/infiniband/hw/qedr/verbs.c
> @@ -3084,7 +3084,7 @@ static struct qedr_mr *__qedr_alloc_mr(struct
> ib_pd *ibpd,
>  		else
>  			DP_ERR(dev, "roce alloc tid returned error %d\n", rc);
>=20
> -		goto err0;
> +		goto err1;
>  	}
>=20
>  	/* Index only, 18 bit long, lkey =3D itid << 8 | key */
> @@ -3108,7 +3108,7 @@ static struct qedr_mr *__qedr_alloc_mr(struct
> ib_pd *ibpd,
>  	rc =3D dev->ops->rdma_register_tid(dev->rdma_ctx, &mr->hw_mr);
>  	if (rc) {
>  		DP_ERR(dev, "roce register tid returned an error %d\n", rc);
> -		goto err1;
> +		goto err2;
>  	}
>=20
>  	mr->ibmr.lkey =3D mr->hw_mr.itid << 8 | mr->hw_mr.key;
> @@ -3117,8 +3117,10 @@ static struct qedr_mr *__qedr_alloc_mr(struct
> ib_pd *ibpd,
>  	DP_DEBUG(dev, QEDR_MSG_MR, "alloc frmr: %x\n", mr-
> >ibmr.lkey);
>  	return mr;
>=20
> -err1:
> +err2:
>  	dev->ops->rdma_free_tid(dev->rdma_ctx, mr->hw_mr.itid);
> +err1:
> +	qedr_free_pbl(dev, &mr->info.pbl_info, mr->info.pbl_table);
>  err0:
>  	kfree(mr);
>  	return ERR_PTR(rc);
> --
> 2.25.1

Thanks,=A0

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