From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7DCE0A04DD; Thu, 22 Oct 2020 08:41:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D76C62BE1; Thu, 22 Oct 2020 08:41:07 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 241161E2F; Thu, 22 Oct 2020 08:41:04 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09M6eo7i004547; Wed, 21 Oct 2020 23:41:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0220; bh=W/k+mSzNpVRhH/eQsH5IfyqbiKT7RV9FKLOPBGZZaU8=; b=YJHTwK2izvF6kIhNabHEt+wQHVfUZzGfYl1GBpQlWEN70ijZjqHGPs3nkZAvUnHzX3aR K5xv0xYBLIu+BCKVlCtZFxMnI8E/2Iiuwb8BO4a9nvscKNEvlJMiLKTy6qiRJxQV2kOS ARCYfjkdErG5/MJ+QRAycX2+8ooXQX1qmWdu8PbiefMiQY/sFJp7LZTR0qr05ORy9of2 VAgxxzq5FkRYiFdK9KVXH0Y52ZwVd4VPh64CZDu+rFzweHYWVP/izVvvJU0AdrTvkbM6 hxYJg+1tQa9WIsgJTijjxaXFuOoq8Rt88Rcc9VHMGEmvlsxStz8I+sNkYD7FvCq2BP2J hg== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 34asbe262x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 21 Oct 2020 23:41:03 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 21 Oct 2020 23:41:02 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.177) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Wed, 21 Oct 2020 23:41:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JB60ITlk1FEcYNVmMHsQYORa59UqeNjRwbJUaLPa1Y8VH1mFKgzt6xWTH4EbE7II+LeIhe4JX0y3XSZ3E8Pc/k0Km401DmjQOEQvMEzZbHzh7554ptjn78b8QqfTY/UtBDfQnpSgfO29BhUjh9IwhurlQDo2YIvf3S2Rp5mFFhlg7mP6dHfgmeni5ZAyM4sxuotTEPINaBlcCh7NeNquiYIPDCbu/Ta6wKlI/X6/1Pp4W6wXBwtGCUz2Kff0QcwsALKq3LFZsd3Zm0gOHJIK7MJjlsmqGiCT1P+hM9dPj2EkT25JwFphFSZsWUwp1fX/3B35mJUj8zOgYjWR9FMGOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W/k+mSzNpVRhH/eQsH5IfyqbiKT7RV9FKLOPBGZZaU8=; b=Em7ZuKQXjkj+U98Qve06Bn7B8+AXsEn24F7P/BgSgtqO2DqtnIhrGO/qyfyG0WQCVgtp9YrHC3JIoekX1F1/YyNb5Yn42PGXa2s7Q9MSTg4B2TtXOqHPqRaW9hq8RJgqu+hay9vg7fb73qS1kEXKEvAfmgmulMakiyMgKam039Ibo7aR/zopVEOyQkXaetiPYHGD973sPQIVaPCzHehyvcepWJG0PXOdCnRHswVp4wuyU5D188T3caYKtnT+P47SDfFpP1gSdnuPftKwe8QLkCInAojvZndrTKwCOizhtmOwl/B0d+VJ0XFU9pdRpN40sJs5l3RM/f50ZdNGT6m9/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W/k+mSzNpVRhH/eQsH5IfyqbiKT7RV9FKLOPBGZZaU8=; b=p2RUEbtGOUKQxmivdi5XG880EKyVZRldRlcbMxcr/eHLv1xGJ2PsApA+vrCx06oNo2y+O2vqfAk1cKEUY63TWA1Xxjfv7Jyux3TdOywGiawhNe7DEvW5kzPiv5c524oPJ9HtoQXJiVruse2Q0FZq+rq4ecMkT11aZS2nfOiesF4= Received: from DM5PR18MB2214.namprd18.prod.outlook.com (2603:10b6:4:b9::21) by DM6PR18MB2969.namprd18.prod.outlook.com (2603:10b6:5:170::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.28; Thu, 22 Oct 2020 06:40:59 +0000 Received: from DM5PR18MB2214.namprd18.prod.outlook.com ([fe80::48c2:9ca9:3159:368e]) by DM5PR18MB2214.namprd18.prod.outlook.com ([fe80::48c2:9ca9:3159:368e%5]) with mapi id 15.20.3477.028; Thu, 22 Oct 2020 06:40:59 +0000 From: Liron Himi To: wangyunjian , "dev@dpdk.org" CC: "jerry.lilijun@huawei.com" , "xudingke@huawei.com" , "stable@dpdk.org" , Liron Himi Thread-Topic: [EXT] [dpdk-dev] [PATCH] net/mvpp2: fix memory leak in error path Thread-Index: AQHWqCtrxW/uOX0UkUyuXNPYWzMjWqmjKu6A Date: Thu, 22 Oct 2020 06:40:59 +0000 Message-ID: References: In-Reply-To: Accept-Language: he-IL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: huawei.com; dkim=none (message not signed) header.d=none;huawei.com; dmarc=none action=none header.from=marvell.com; x-originating-ip: [89.139.26.150] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 114c2150-46b7-401a-9feb-08d876557007 x-ms-traffictypediagnostic: DM6PR18MB2969: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: gkVUMGxXeMm0BWu2Wm0yQjgorI/Pdpd11f/sBfD25h1g/Y99cR6lOie09TCmdI4Zjx9HdA6SbdE6MScRyXTHprPu8fUW+MtiQObDrGdGzgkOEk7H+XLywe6BK1ohke3+DyFPIXZHSDh6BQSu9Vcdv+HuDeXmCrLg+Lq2ueORhJFhe+mrglDjVKJtJH0Rrwz7M8G0xoUVcKCNzS3E8NMjHOdong5VLbWd8+r2JDfP0ifrOZeU7YuVC4FnGYJ7hT3SNsjyNCXpA2IlWsruLuRLx8huD4Y+foBZgDjEGbCne6GA8tYOqhKbECUXxQ2GwaDIDrsKAAmTl0yHy5sVhsMMTw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR18MB2214.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(366004)(136003)(396003)(39860400002)(53546011)(2906002)(5660300002)(478600001)(110136005)(86362001)(54906003)(33656002)(66556008)(71200400001)(26005)(6506007)(4326008)(64756008)(83380400001)(8676002)(52536014)(7696005)(76116006)(186003)(8936002)(66446008)(66946007)(9686003)(107886003)(66476007)(55016002)(316002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: 43EWVzLqcjH0nXECnLKxJUxrmp8ijgLWQDI7LIq4vUN3vn2RExP9fsfLEke9OWEnlcEoHxCrc2blQD7JMmTbvxulurYujAJ7q8655z+1QTQ0r8P8qgZyGX3VirYKmdr+jPRphJHrOnYQucAnDooNPsyTCj0vzyEIaaazE3iSmqiwI7CkTwxXhvbfXCcURJFGqjcM4iqzuK1K8tMO4Pv0ATV30/9yd7odjzvpOWOckYdc1Ra2NZ/pBj5WcjdJgdLSPo/+1KkrIgXSMC1XxU8T3G50T2A/lz+2E3YFsQfWtfIEEhdGvR5bvm5bjoa7/mHDP7d0NSrTldMdNonDJGEdH2GGij8/0dAKmxLMAmRRvhmqbWsOI2iZsEEbwubb79rzRGn4fwmxoI1nQFm4vOB1f0vD2L5Sh0tXmpoRgLuEkC8dBHDtvgFFjc5ofKlxoWy7JwKi4JxnKr+38k1Cx15ApUQCiWG3USCyW8WdcK45X9M2cYVFd9H6sK6WZirGA4DXowFYK7MoLCWWwQzqmy3nQ34p5lua/eoRFAGK++tp+CdQ5VL+X1t/+YdQDkendc15fJfrPEtAMITq8/6+TVlqzz8E7R0sVLcvMyeD4duG+R46T9R0IOMKw/uFJvXYcRzkcZruu84sCHkaxnKq7gOeqA== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR18MB2214.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 114c2150-46b7-401a-9feb-08d876557007 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2020 06:40:59.5991 (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: J9NsPB/3RDIIzVFivRyVNMjN0AlvYapcMK/o8jHErWq1wWOPozChc6U+twtSFG2lV6gUC5AUJ4ymDNaPumVjVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB2969 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.737 definitions=2020-10-22_02:2020-10-20, 2020-10-22 signatures=0 Subject: Re: [dpdk-dev] [EXT] [PATCH] net/mvpp2: fix memory leak in error path X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Acked-by: Liron Himi -----Original Message----- From: wangyunjian =20 Sent: Thursday, 22 October 2020 07:25 To: dev@dpdk.org Cc: Liron Himi ; jerry.lilijun@huawei.com; xudingke@hua= wei.com; Yunjian Wang ; stable@dpdk.org Subject: [EXT] [dpdk-dev] [PATCH] net/mvpp2: fix memory leak in error path External Email ---------------------------------------------------------------------- From: Yunjian Wang In mrvl_create() allocated memory for 'mtr', we don't free it when profile = get fails and it will lead to memory leak. We can get profile at the beginning of the function to fix it, before calli= ng mtr =3D rte_zmalloc_socket(). Fixes: cdb53f8da628 ("net/mvpp2: support metering") Cc: stable@dpdk.org Signed-off-by: Yunjian Wang --- drivers/net/mvpp2/mrvl_mtr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_mtr.c b/drivers/net/mvpp2/mrvl_mtr.c in= dex 39272acea4..2fa5cb43ad 100644 --- a/drivers/net/mvpp2/mrvl_mtr.c +++ b/drivers/net/mvpp2/mrvl_mtr.c @@ -329,6 +329,12 @@ mrvl_create(struct rte_eth_dev *dev, uint32_t mtr_id, struct mrvl_mtr_profile *profile; struct mrvl_mtr *mtr; =20 + profile =3D mrvl_mtr_profile_from_id(priv, params->meter_profile_id); + if (!profile) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, + NULL, "Profile id does not exist\n"); + mtr =3D mrvl_mtr_from_id(priv, mtr_id); if (mtr) return -rte_mtr_error_set(error, EEXIST, @@ -341,12 +347,6 @@ mrvl_creat= e(struct rte_eth_dev *dev, uint32_t mtr_id, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, NULL); =20 - profile =3D mrvl_mtr_profile_from_id(priv, params->meter_profile_id); - if (!profile) - return -rte_mtr_error_set(error, EINVAL, - RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Profile id does not exist\n"); - mtr->shared =3D shared; mtr->mtr_id =3D mtr_id; mtr->plcr_bit =3D MRVL_PLCR_BIT_INVALID; -- 2.23.0