Received-SPF: pass (google.com: domain of linux-kernel+bounces-49226-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Subbaraya Sundeep Bhatta <sbhatta@marvell.com>
To: Zhipeng Lu <alexious@zju.edu.cn>
CC: Sunil Kovvuri Goutham <sgoutham@marvell.com>,
        Geethasowjanya Akula
	<gakula@marvell.com>,
        Hariprasad Kelam <hkelam@marvell.com>,
        "David S.
 Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>, Jakub
 Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jesse Brandeburg
	<jesse.brandeburg@intel.com>,
        Richard Cochran <richardcochran@gmail.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [EXT] [PATCH] octeontx2-pf: Fix a memleak otx2_sq_init
Thread-Topic: [EXT] [PATCH] octeontx2-pf: Fix a memleak otx2_sq_init
Thread-Index: AQHaVQzY6NkC3X8CSUm1KvCfvoOgY7D2f3/A
Date: Fri, 2 Feb 2024 05:01:20 +0000
Message-ID: 
 <CO1PR18MB4666BB2DF72E4E463CEC9F77A1422@CO1PR18MB4666.namprd18.prod.outlook.com>
References: <20240201124714.3053525-1-alexious@zju.edu.cn>
In-Reply-To: <20240201124714.3053525-1-alexious@zju.edu.cn>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: 
 =?us-ascii?Q?Xx8Y1BQX0qFh3gHS0pmiAR4NrurC8cDfkOhUNvIY7gduWhp8komdgdVEd5vE?=
 =?us-ascii?Q?jqlwb+orxV7oOHOpw86uoQGzMRuHrLMAIG+X6SfuBHXyKyvXTcZp8R2pjn1S?=
 =?us-ascii?Q?en1cj2EF0hIR68A9Ve/3K+u6eXO600tN/soqFKbxXYhjo2qy2mOfQpnkKWqf?=
 =?us-ascii?Q?05YqQyn94SnguHU8wrNsUQfpoAKBqdRtafbLhxqM/gnNra3dpLLsBT+Yo47S?=
 =?us-ascii?Q?Np48HqdSiOR++SN9loRHobDl9ceoYDpWiOL7ZVjQTr6YPYr0sVMa019/XUQd?=
 =?us-ascii?Q?AngibchlECCmheYlXYcVqnH3sgtYqoEfqJZm00g4EqsjLaM2U3NiHe9kqcYX?=
 =?us-ascii?Q?/X4SWlDkOZl1RMOYYsxQ/TRNFFo0NnwAytn8W2MEDXPhrrgN6wHsRBDiW7Qx?=
 =?us-ascii?Q?i9B15m4nD602ylk+yinhQiOYOIv6QwuMld2GA980XoC69dGogX4FMakuIq/Y?=
 =?us-ascii?Q?7yZWAQ+0HjLPnrKEyFXViu+TmlQxkE5Jx5J1Ne4T7OlRtbyqkKAI43Jh5rSY?=
 =?us-ascii?Q?M/vpHZhD/vRiOhr+mO3pKu7+v+/d2CnbIbj21IXyH9c6xJL0Dzi5lRJEcRMx?=
 =?us-ascii?Q?m8ge/cas10s1gX/yRyklik43U8SDfPq4QDq4BIEAW9fYsFek3AYTu+vuH8zB?=
 =?us-ascii?Q?XKpoLql9YVm2fWeCU/0RdXDSvBBMbH6Xy4RaMiRV6Z91oJ+I1pr+C07/4F5o?=
 =?us-ascii?Q?tvw+4ihDMlnjLWTHR5W/IRe1b8wcbAxusS/vmGnsGGU6FfkoHw8kTViwyRdf?=
 =?us-ascii?Q?l8gO774/mOm+9+ooibeNmglS9Dn6FBMRoQBXawiQ+9zJTsEvpJCDQOaFhSjL?=
 =?us-ascii?Q?6PyrH/G74FAXApMDlCTggYNmfN8sJy+uV1WaURtFULcyxx4ygOgh0oodPzSl?=
 =?us-ascii?Q?VbQHRfpyqL2oVAWXwqaEcpetZvo4sgX3l6RNZnDdFhwy7h0IQKT3YjpPjLZA?=
 =?us-ascii?Q?DoIB9FjJPb463dbXEJWv+gPlYG+RNAukWGjw3QeNq7xnIk/ffHi3XbGhU6on?=
 =?us-ascii?Q?X3ZTL0kYj4xhIsV+OLwJezwftMGHMmknobvRwwqYFTFr33E8XTyaIy4jpJ+V?=
 =?us-ascii?Q?u7kjvUKnj5U9at0mEIVuPRmmlFDwpIpN74qRIq3WWLkwQcexr3H7RT2dpg/t?=
 =?us-ascii?Q?GJh3VaiCuThvOZeJHRkaWWRGuGpzB3naLcARX+Homa5/rjQqJhWNCnHu2GY4?=
 =?us-ascii?Q?N7mZ+tz3jqruu99GRqifBPJwsCvKNjGmpCaxll+goUwVBVW9taA/6szailUl?=
 =?us-ascii?Q?Xqi/XeKXhAeHzJNufOz9lPmfPe4PZeh+DVl3qhJLyHZyUsXB3M6RsLbtrtJj?=
 =?us-ascii?Q?biNt6RChaSnAXxsZ+mD3/PjQq5OV4YN++oBl/dFj7dJVG+N1YofOEt1Qsg8t?=
 =?us-ascii?Q?Zl94kddOEZGWi9b4s70B3hX/A6u02okgsS4fD41Tbf4WLg3lX66EJjLROOsS?=
 =?us-ascii?Q?aiOq/sEF98qs7JtHgBCKWcsacrO4UdD1FjmmsfL44MWGUXljYAYCuuB5ie6q?=
 =?us-ascii?Q?fzlZZ+/zmsUDmsOa90LGAFHJ+jY5zjBhSytyVuGKgXjLh1+DU58jLEEMbY6p?=
 =?us-ascii?Q?TfdgtAylxKn9vBaCQjfGwUDrHUned76bap9cNwvf?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: marvell.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CO1PR18MB4666.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 26d2dea9-6183-41d5-a74a-08dc23abff14
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2024 05:01:20.5658
 (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: iybBMR1TdKrPffTqHrxRgDnMlISbdbyORwITsxe7F92hz4/xL3q7NJlgE3sdSLTcmQBC7WNipPBKHZ5zaEUprQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR18MB5924
X-Proofpoint-ORIG-GUID: 5pwnFBbWrl8xYSl_bWiPlMv3dODhnLky
X-Proofpoint-GUID: 5pwnFBbWrl8xYSl_bWiPlMv3dODhnLky
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-01_10,2024-01-31_01,2023-05-22_02

Looks good to me.

Thanks,
Sundeep

>-----Original Message-----
>From: Zhipeng Lu <alexious@zju.edu.cn>
>Sent: Thursday, February 1, 2024 6:17 PM
>To: alexious@zju.edu.cn
>Cc: Sunil Kovvuri Goutham <sgoutham@marvell.com>; Geethasowjanya Akula
><gakula@marvell.com>; Subbaraya Sundeep Bhatta <sbhatta@marvell.com>;
>Hariprasad Kelam <hkelam@marvell.com>; David S. Miller
><davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski
><kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Jesse Brandeburg
><jesse.brandeburg@intel.com>; Richard Cochran <richardcochran@gmail.com>;
>netdev@vger.kernel.org; linux-kernel@vger.kernel.org
>Subject: [EXT] [PATCH] octeontx2-pf: Fix a memleak otx2_sq_init
>
>External Email
>
>----------------------------------------------------------------------
>When qmem_alloc and pfvf->hw_ops->sq_aq_init fails, sq->sg should be freed=
 to
>prevent memleak.
>
>Fixes: c9c12d339d93 ("octeontx2-pf: Add support for PTP clock")
>Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
>---
> .../ethernet/marvell/octeontx2/nic/otx2_common.c   | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
>b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
>index 7ca6941ea0b9..02d0b707aea5 100644
>--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
>+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
>@@ -951,8 +951,11 @@ int otx2_sq_init(struct otx2_nic *pfvf, u16 qidx, u16
>sqb_aura)
> 	if (pfvf->ptp && qidx < pfvf->hw.tx_queues) {
> 		err =3D qmem_alloc(pfvf->dev, &sq->timestamps, qset->sqe_cnt,
> 				 sizeof(*sq->timestamps));
>-		if (err)
>+		if (err) {
>+			kfree(sq->sg);
>+			sq->sg =3D NULL;
> 			return err;
>+		}
> 	}
>
> 	sq->head =3D 0;
>@@ -968,7 +971,14 @@ int otx2_sq_init(struct otx2_nic *pfvf, u16 qidx, u16
>sqb_aura)
> 	sq->stats.bytes =3D 0;
> 	sq->stats.pkts =3D 0;
>
>-	return pfvf->hw_ops->sq_aq_init(pfvf, qidx, sqb_aura);
>+	err =3D pfvf->hw_ops->sq_aq_init(pfvf, qidx, sqb_aura);
>+	if (err) {
>+		kfree(sq->sg);
>+		sq->sg =3D NULL;
>+		return err;
>+	}
>+
>+	return 0;
>
> }
>
>--
>2.34.1