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 BD2EFA04B5 for ; Thu, 1 Oct 2020 00:27:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A02431D5A8; Thu, 1 Oct 2020 00:27:35 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2102.outbound.protection.outlook.com [40.107.92.102]) by dpdk.org (Postfix) with ESMTP id EDACE1D577; Thu, 1 Oct 2020 00:27:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PCDiC9jBmkhPHLRucH0p7ipoza1aJ1O0DoSCVCGHpw3M2nrh/2XIsYcyU+geWYkiCk5OjTsl9k8hQopjNkpKSeYwFNvRYnFNNQ82jiTRQPnWaAYKsTWyT72+cvxIKpUxLi073rDxp0x13XqYOL+YU+mGyMeLQIM7Z6xmuYvtu4iuRftfJQoGr6/AxHyh5UGwngsUwGIOGNYUuiYNLq1vlmYtrhQcTnicZK1z2EfLL7jT3j08n+s1bcWByfhVJp3mfTGzE4WAgTncPgXaPVkkuE3y9eS5cGbQT7g6rRRmjYQdrty9qliro61R5FeseOUXn3dfBsFxuJ1cX2FtZyH0tg== 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=iZN5S6OlCsvLNXCsHvErLWQNoTrCoBKfToOxSvre7W8=; b=h2uvg7GbwBhGgC0X1ACMvt6yUJzsd3JiLYL5W1jo12uqgy61Iy2ydvydLF3POBZEQqq4qKPhzXLXhsyJDEkZZz27fgtVtbzPyXA3JK1mX1SPoGCTaIsHDao5m7EOucZ12SustFikBRZL+AVg7zdzNnQVgp7DzEUVGUi0l2fVbNldnmGU+ixxRlGPTuyolN/VTKcUPMi8S8iNGGZyNf067KHu/di34Bw+tmZOl4t/WzqOjQzx6RSSibqQDnqhV0dZGFFRnMpm2j7CPzIjNqgFAaQtlLcPCqnyO1YrzkIwipkwYjIyst6nsxf/WGKyPKv3mPwpNU6CAXIjZquP+G76jQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iZN5S6OlCsvLNXCsHvErLWQNoTrCoBKfToOxSvre7W8=; b=NfAW29fwzBFAokIX5q+awK6m65KOpJqVcqiVvVz5hBh5Ub7n2paETv1p4kY5Fn9hdATKOShxD4PYuNZAIbFeXa9f0sE8qFIg0biWLpHxBRzQlhFp3ulU8F1jY5QpQX7ey5+nUZ5UoqFzK+IZc4A+sy6juBGIHg+sNtsGq6ub7nI= Received: from BN8PR21MB1155.namprd21.prod.outlook.com (2603:10b6:408:73::10) by BN6PR21MB0164.namprd21.prod.outlook.com (2603:10b6:404:94::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.36; Wed, 30 Sep 2020 22:27:29 +0000 Received: from BN8PR21MB1155.namprd21.prod.outlook.com ([fe80::ccf4:7bc9:ac7a:1a19]) by BN8PR21MB1155.namprd21.prod.outlook.com ([fe80::ccf4:7bc9:ac7a:1a19%3]) with mapi id 15.20.3433.020; Wed, 30 Sep 2020 22:27:29 +0000 From: Long Li To: wangyunjian , "dev@dpdk.org" CC: Stephen Hemminger , KY Srinivasan , Haiyang Zhang , "jerry.lilijun@huawei.com" , "xudingke@huawei.com" , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] net/netvsc: fix txq leak in error path Thread-Index: AQHWlmalxhQWUWy0SUel8IxFtHjbm6mBwwiw Date: Wed, 30 Sep 2020 22:27:29 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=a1ab92ab-9b77-4070-96fc-dd6c91b738a9; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2020-09-30T22:20:35Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; authentication-results: huawei.com; dkim=none (message not signed) header.d=none;huawei.com; dmarc=none action=none header.from=microsoft.com; x-originating-ip: [2001:4898:80e8:a:ede4:db5c:c6fe:798] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 139ff353-a2a6-4a73-f90c-08d865900460 x-ms-traffictypediagnostic: BN6PR21MB0164: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4125; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xHk7i/Ljd8mX6dLI3icto20hQEhmGTElC5xvkIa6WBaGBl/WjYpdYsPnhaMOzqwbROsypDavWRPqUqWUW9atbBhaFNkCKHPl0GclF6JOUpAMY3Vwx5Ve7N2qBxobWII54BM5CTqz+Q/2YQ6MnCADk7vnAkP23PutIMgfXzAfWVG4vuhJwHwA7xse4gat5LDz4SRy+Q3sDVsf891FtNVz5QOPnz3mJrTzrbqkksgkifocHAL+lXjolDj6EsZW7TUOwF4X/2g8lSZA117I+lZn/2fFp0B+KHyBPrXfJ6mbRpCu5V+IfPTDAaQQlsnkGieaKvzJFmgDdKkRGYf/cM2zRQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN8PR21MB1155.namprd21.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(396003)(366004)(136003)(39860400002)(376002)(316002)(2906002)(7696005)(478600001)(71200400001)(8936002)(9686003)(186003)(55016002)(4326008)(8676002)(6506007)(54906003)(10290500003)(8990500004)(110136005)(76116006)(86362001)(33656002)(66476007)(64756008)(66446008)(5660300002)(66556008)(66946007)(82960400001)(82950400001)(52536014); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: GMZWHWn4Oy4wBEcueou2WFIuKFiAw+HmGsY9fwvwVFSVDtQ/jUC5MfLMNn1NtykxoHyBSuZlX+D3te908ckZgzr4FKQCqrSHJeKlCji4EV3q/ZScISz6TukAxzUpntf407Lv0Kj/OyWzvvqG4QpB07jWUDHV0d/yUdwGyRMajFLoiaON4uM/zVSWux0RZWqWeHpxPjZ7gDZdaoP6bVvZ+ZTs9+WRQMF/1ijmbM8wvftVRRdHp66P0A8remYhUgUKMDS+k7oJBfOJsyA8i5rFu7kQIfAMvP/WL8+YZxFZAKVXxgn+6v13tDqXLVWF7IT9nYVD6MFLeMA4/CXDQO7W+ZwvvfTlU7Oddxk1A4/2yRCdBfHHHK+d5PIc/1cB1khARjKkbe0WkKh753/Vw0Pd7TmD8Fm7xOC9EI+TXnXSO7ABHnIkB/5I8eLVWioW94IOHMRVF9NauW0B1HpklXO25LK3/CeJUiCN5xr4aUA/nhnW9FJqqgdTA0FmjDsI8c/G1ifv76JvFS3Wb0h36W7hotgwkGMZ7dsdy6Gx8W97lEvfs9EdVTwLfJWoeQk9S2618Rl0hwpY2NzXWyRq8kPKdZrxxL/Ri8J06C63oDS5UbqhNeQj/i5jSyFq55N/22VoR+gaPHrbymQfdJWKamQemI9fA4EDQL6N32xhNdnPajM4mh/W5hh37NUqeP9aGj+KKwiKF+iwsZOpwAGeXMFFtA== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN8PR21MB1155.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 139ff353-a2a6-4a73-f90c-08d865900460 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Sep 2020 22:27:29.3776 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ME5eLPqr6FPobVFjWU7fKStGrk5WsxgfLfxALqLw7sap+AbOskGz/1DTohE9vG/5GvBldjE9eHnlXD4pnr2OwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR21MB0164 Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] net/netvsc: fix txq leak in error path X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" >Subject: [dpdk-dev] [PATCH] net/netvsc: fix txq leak in error path > >From: Yunjian Wang > >In hn_dev_tx_queue_setup() allocated memory for txq, we should free it >when error happens, otherwise it will lead to memory leak. > >Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors") >Cc: stable@dpdk.org > >Signed-off-by: Yunjian Wang >--- > drivers/net/netvsc/hn_rxtx.c | 1 + > 1 file changed, 1 insertion(+) > >diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c >index 65f1abae5..8c94e7ee3 100644 >--- a/drivers/net/netvsc/hn_rxtx.c >+++ b/drivers/net/netvsc/hn_rxtx.c >@@ -273,6 +273,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, > " (tx_free_thresh=3D%u port=3D%u queue=3D%u)\n", > nb_desc - 3, > tx_free_thresh, dev->data->port_id, queue_idx); >+ rte_free(txq); > return -EINVAL; > } > >-- >2.23.0 How about checking for tx_free_thresh at the beginning of the function, bef= ore calling txq =3D rte_zmalloc_socket()?=20 This way, you don't' need to call rte_free() on error. Long