From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30048.outbound.protection.outlook.com [40.107.3.48]) by dpdk.org (Postfix) with ESMTP id 8D5CD49E1 for ; Mon, 13 Aug 2018 22:40:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aDV9M+6vu84dEy2bKnQfI2UkyzCI7vdl4oMkJ8zlW+Q=; b=wsYveNKdEFrLK4bndoLNa5Cqn/em6RIKpMf8nIWtwRUDy9c3A5Hlntr8zUMXSuxTii1iX132qemHi/rize4I6I/kjS8Ja1foDVwUnLQ/+Mu2/annL5ODq+mX3jYUCloTmubHJwVbaCvgv71V92N/ec8SlHtGxrZ7r/9ZWjrr9SA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by DB3PR0502MB3977.eurprd05.prod.outlook.com (2603:10a6:8:10::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.19; Mon, 13 Aug 2018 20:40:33 +0000 From: Yongseok Koh To: Ajit Khaparde Cc: Somnath Kotur , Ray Jui , Michael Wildt , Randy Schacher , dpdk stable Date: Mon, 13 Aug 2018 13:40:03 -0700 Message-Id: <20180813204010.25281-3-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180813204010.25281-1-yskoh@mellanox.com> References: <20180813204010.25281-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: BN6PR2001CA0042.namprd20.prod.outlook.com (2603:10b6:405:16::28) To DB3PR0502MB3977.eurprd05.prod.outlook.com (2603:10a6:8:10::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38cb8997-c677-4fd0-7657-08d6015d0555 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB3977; X-Microsoft-Exchange-Diagnostics: 1; DB3PR0502MB3977; 3:HVUW+WDRmxkuigC8W5NZCE3Q0rXMSOYYFMWGgDP+f6Yb+GNe19P2zSOai8b63Ga0ZcbBTSXoaWaC4fUEAACFtO4wEkSsavJulnC1d+ggUGpxngzkGdBvYQZshJRYGQ3ng8TTZZmMSYg/jSSHE/23HFGPFOigbO97+yNPXSu0OXd3gM3/aWQCeTuXRem5TOVbZQ+3/adhghP9nzvu+hPMmxL84dy/ZhNuZpLIZ4QRSCXgzH3pVlUiKD7c+IVoWn/X; 25:q3UTzBuwXFAybC+yCOZ1wz7HgChBhwZbGhKnW9ptW7rxLGPuI3s/SNPiEikCCnJjpdycIpD5VTO9mg+2gfHKmfRmf6H3uz7j30M8RGVFQxysvKGtS60VNhC1gm1haHqlTz+yllyKjvUY4axhCBSPIUjeDobyr6fyXfA8txGvCtUdUVTX/+5eHhZtzHFPSWlBm6p1NOSApZfsEIuG1ogVpuLpQW4+UssNmwdnglQE9gSq+Im4Qi8Q05JzSSCP+g5D82XAEKWg6sq+G7H6V5wy40QBPFFC1oNWiPXZbLZKdavuVLjz3o0oYBWkWopYguEdyOHr+Wbg2FL+BGyBvdg/eA==; 31:FqqzzZ2cgWy/06AKreMuK4EegI9PYuExKpOgzl2xkA1Io54EKHdDKzooFRbpMtVmngxyFa8aettnHRTQ/Hg9XUM6RzQOfvDCCJodcPJ+1OmTrXi4kP5s1eDJ2qpAUIF+Px3eMp0/dE4PVzsxNxjeb34kctw0tSb4tzVT6H+e12SmOlM21RsFRyx4UeGI2CNc2WtfTYhEs/Zl1aPjVoxY2FKb6DIVMsMb/TmF3Ueux+Q= X-MS-TrafficTypeDiagnostic: DB3PR0502MB3977: X-Microsoft-Exchange-Diagnostics: 1; DB3PR0502MB3977; 20:9S/r5/3H/frahq/LIAgLNAIVSZfxevfS7KGuQlAg2GKKb3D62hCiZttBWjo5oufVXvSaPbvgnm/qEf9DaksrCYcAOz9B/j9o8Sq3iQ96SVnW5F9GCHWo5nZQDQXq/l5jUXYhZMXP7GiNFYAOc7v6jk438rwz1gJeBFi1K49CVr4EBQwLGv2MJsOcjmzJmvv/AAnTvB9QATMx/4g9lCXAEbcxFrYTgXlvJtoXCfgQJ7RsRKJg7MwBTgIUF6xrFsDv7WUHcplkvW9TBviYQa0gEeeA2yWXC5uWv80ONYvp2u57A+pVU6ALEgai7wHV5F4JaGneGxQEPv16TfzcgNKW3RdfswmGmrttp1OlEmXo3xJbzn9wRKU+MCn1HbH+FwGnT0ue8FQhMfAMhsX98RZ8RAzDQmE2WeI6EtjhkBUrP4iCJ4iMyxcdPJ5D5mn+5m69TNVQl7p3t2p7DBlCxSY+jMdTarfQnSDgDIs08gLLKjrn/nyHJkIWVlffKcPwrRlJ; 4:v6Yfae3ciDJlA3oAadA7w9xguf2vHY+SBQBK682P4cmEBwKTbYNxuKXl7LNmkQKNy1rWyPRizQdysSdCTn8kfxUQeejBJqelVF1/pMOhCKqFGWK71SenSSnR1INh18g7v/FKx6IrytPs0dvyP8axSH8832AcSV1HEGC07Oxx1Im86qoqBhVrdghgvpVqvHxtaMWdzutm3IvyG2XhiRYRXwa1tJ5FrV2b/GxZ3nbzt0cIsUQWBBOq/u0aY7qu6U9KAHzxMRWzbf0h41j2Lp1aEjdlFBMnnqWa73uWUfGdosPlKscWgGUIWJu7Hk398dPs X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(208715162771679); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:DB3PR0502MB3977; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3977; X-Forefront-PRVS: 07630F72AD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(136003)(346002)(396003)(366004)(39860400002)(69234005)(28163001)(189003)(199004)(4326008)(6666003)(6916009)(7736002)(47776003)(50226002)(25786009)(105586002)(26005)(446003)(53376002)(6306002)(48376002)(69596002)(575784001)(86362001)(53936002)(8676002)(81166006)(966005)(81156014)(16526019)(305945005)(186003)(66066001)(68736007)(21086003)(386003)(1720100001)(7696005)(52116002)(51416003)(106356001)(1076002)(50466002)(6116002)(55016002)(2906002)(3846002)(16586007)(486006)(5660300001)(316002)(54906003)(36756003)(76176011)(53546011)(956004)(8936002)(478600001)(476003)(97736004)(11346002)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3977; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB3PR0502MB3977; 23:lyMS/w/2U6AvEP9/ja6MyVLQCiP9/QGbkH+iyR9?= =?us-ascii?Q?Y1vYDQ+yY/oYebtuLBgFQt5O8wiX4u0eKL77JKafBBPuZd5Z+gXzJNw23QFo?= =?us-ascii?Q?/MrXoCXhqqRes9xyBjr0BdTZ/jLjoK0aY5MbM/xeY6+q7CELI1OUb1xD/Lu3?= =?us-ascii?Q?9k6cQzkFjCb2Gyhm2LxpGrF3hb4O1dWdKef6mWlxs1vSYITR0ExB939EcohM?= =?us-ascii?Q?GP7ZHRgwIXG+kAA9quepMFwNezy0U+7srDveDrjKIVrkYVAPY58LWGY5ADTO?= =?us-ascii?Q?9/FDuKxZL4nQbhkFCZzk1zjxB7SkK8cwpjW/zbDCS2j6s30JdwW7ZpeUz35s?= =?us-ascii?Q?/Z8NZ2CXWJaXF9dedggoJSWvtNTmYAJwKlSwVdcRBBfBC1UlRSJ0oyjmKLOI?= =?us-ascii?Q?M6zfHpXmoC+dy2PhrBmvzJQRrXCGTXu1PhJyKrkkbjL6Srh1j/Vll8LX0Cso?= =?us-ascii?Q?ceE49ah0MLl+95lJu3BLB5SyYr10/POEumx7AzI07dGichhUREFdAL+jiism?= =?us-ascii?Q?4yHsrMV4ebVipJ78xLhL6Zc4P4KPNt7iHWZH8t38sx4uCPhtsqx8zEl+vjQP?= =?us-ascii?Q?Wqi+aq+4U4mLJ1h71FJZQ7z4fZwACEhM678kHPRBNTko9j/Z5xYm9gfz1f1Z?= =?us-ascii?Q?Y4noDWlHn8prh3MzKLEyqeVwmZ5cu+ekuSLeRf8kX5dD6gV4O81pgH5T9BPw?= =?us-ascii?Q?PdRD8xC7WDApSYAR7AN4XEIby8xMJfnMmkLDDNzh3JKLedro7QhAJlLOc2qP?= =?us-ascii?Q?bgx+SD+rejea4XcAjHH+IlU/y4VofqbfpmSx+4wM4a4DzTit1zap7WLk8PGE?= =?us-ascii?Q?BuPIIRKSsX2G1Cs62KUSOtTTD0IZEuYDVQ//gKvngLjAD/vJCQpJF90FXItL?= =?us-ascii?Q?jepR8tmd8nwxrc/HQPmJlv8IGe8cCBBAiIMVgtmyU2CDHJIV00z7HQBhoVoE?= =?us-ascii?Q?TwkESpKAfd3lT1bEde7L7N50o3ovNMn4ZDEweop9mgkkgqOsk0cS7Gn+5gMA?= =?us-ascii?Q?XjCdjNzoo0R+ualwn4gwGC2PFJe7pFqEjk3yGsNpGgh7suveA/2PMtQHggCL?= =?us-ascii?Q?JCxafwTxvFfSsW/c8eid+BbVAh1ylx3LKRN0nFxIKoyuVSGWnNc6hGVM36wa?= =?us-ascii?Q?FvxQbXcSTSXXwvvG8yXmPZPW30rLEgnEmYJnmBQC31rTEXLLEuAH7zOlSG/U?= =?us-ascii?Q?qOmr2nM7ro+bAHimJ4Fo13sUfFZ1HG3oYZtbqeNCQ1+2kVKlktOKC1H/X3GI?= =?us-ascii?Q?VX+iU08gH5ndz5TKNgpO2oocaUB6fVBTavYOpW2iEjqkUBPAIHtB71Gq3ijf?= =?us-ascii?Q?x0uYY4WaEj6dpJyrVQp6l3/2GYLWiWjgIyMaVxQr+pzPE4O4vMUXt19twOiE?= =?us-ascii?Q?T55rcNYKVx/U1imRqHY+uNcDjc0u8Vs+o7G0QXi07hPc80i50?= X-Microsoft-Antispam-Message-Info: OSqPzR/J730oHqhwhGyN8PbNvtsQ12STVm0KFZZsfUw9iXW8r3xIsgE5GeJib2K1XLryCZ2E3K1SJlnCKQ6ODfLckLdzFqBcQZlqjnApezKvf1rZUAOnAzcbRFguT0n3GiI6EWYv0rmYuVklFqfFzdN0VDzO0emjpD7fP2fkS3A9jg4PJ5uNrPMCbYi/pUW3ESIXuPolXqWved9sO1fgrG1QGyQ7gXFTxLvsdl52km/9byFKEudE/zE1ZbY49fONH7OrQiRcdwVBOz7BW3I2pmF5VQC3xtUYx7ndC//CeNq8uyuBbMo7RX+a6GfeasfGAb4pykYtcyKlV2FUj7Pgb8PFK52Anf09IFTBBYs/ye0= X-Microsoft-Exchange-Diagnostics: 1; DB3PR0502MB3977; 6:o8F5lzKYp2sKB67NSpJiQXnXUXGbwJp5ft8JbJWbM9/18s1O0qHlCh/rTFqsBSSrhsoH1voYnG2XRUCSm59WdMNHD4lXmLfHcY91sUPIsb7cJlXu9pRqEqk/KCv7ij7+zc/V5b9YMKwfMm25c+9BrYuZkDY7e81iPcv5EhehlQAl1QsaE5rZJ0PvqDTi+6Y1UxAaEu17eXjtsGrpNcGlKu3x2F14ZPzro66DBkWu5+5ZxrbSswruOW7TDiiNtiyAQIjujSTMt0/qY7YRNfLyx/tNe+WKWpw2UDcsuN5xZKmmp2Z5qgQ7mwXjsuOcRcuiyATjyddkIYPrYqyOu9UdrnCbhxZDIxfp7nMP5LbAv+tn4cnL2aAKbk3z1d0D9Iu1mgsd0rE4yqduYCjH4tDw/dhI7ays3p6/X4WJuYpzwSw29qUEr34nSzbm5jnlVhVRGaUIySYAOgpB/48ktxQ9Bg==; 5:sLk4L8dGxeBT4Aho+VL3x79jl+Ia8hXdIovQgt7nG4NFZDiDS3oJ3uLH12PXiceunIeWHk0VaL36xi31kcBTlOSo+7ay5zm7GofB4OZ7sqTG1SHW3hGEl/yU1oefIA+vSeTTtFN688P51F7U6304auvLg0/Y60OCsmXEie6AC2s=; 7:uXutHQqgF+ZNepq3eYKNwBTjlfR1NKHbfVcgSxaUGdwQW3M0HfOEwTfAsDttx4N4CUsCU2PEQlQYaK0dl/j/Luj2z7fV6jBYuT8YyO/M3VUheEzipMxwp4fF+eTlJ/ajRYJ7E8BJ8khzBxsAgPh5v6hM8B22ZqRXe/uUsZPuPFhfL1Jm0CwKVyb+UP1tWMHrLwrdefM8TJUqjsFaUfKHndFg7R0ogSDauIr+ymCEi0RPg6NmwCbJ90be9uGOZh07 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2018 20:40:33.7266 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 38cb8997-c677-4fd0-7657-08d6015d0555 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3977 Subject: [dpdk-stable] patch 'net/bnxt: fix memory leaks in NVM commands' has been queued to LTS release 17.11.4 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: , X-List-Received-Date: Mon, 13 Aug 2018 20:40:36 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/15/18. So please shout if anyone has objections. Thanks. Yongseok --- >>From 6421d9662b12d3a9226b33a9ea3cf8f762771618 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Wed, 25 Jul 2018 18:15:45 -0700 Subject: [PATCH] net/bnxt: fix memory leaks in NVM commands [ upstream commit 6621ae146166adaba8dc4c120ad8c0fabab95830 ] In some cases we may not be freeing up memory allocated for certain NVM commands because the code might have bailed out before reaching rte_free(). This patch moves some code around to ensure the allocated memory is freed before exiting the function. Fixes: 19e6af01bb36 ("net/bnxt: support get/set EEPROM") Signed-off-by: Ajit Khaparde Reviewed-by: Somnath Kotur Reviewed-by: Ray Jui Reviewed-by: Michael Wildt Reviewed-by: Randy Schacher --- drivers/net/bnxt/bnxt_hwrm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 9aa39e190..ce66dc53e 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -3106,13 +3106,12 @@ int bnxt_get_nvram_directory(struct bnxt *bp, uint32_t len, uint8_t *data) req.host_dest_addr = rte_cpu_to_le_64(dma_handle); rc = bnxt_hwrm_send_message(bp, &req, sizeof(req)); - HWRM_CHECK_RESULT(); - HWRM_UNLOCK(); - if (rc == 0) memcpy(data, buf, len > buflen ? buflen : len); rte_free(buf); + HWRM_CHECK_RESULT(); + HWRM_UNLOCK(); return rc; } @@ -3144,12 +3143,13 @@ int bnxt_hwrm_get_nvram_item(struct bnxt *bp, uint32_t index, req.offset = rte_cpu_to_le_32(offset); req.len = rte_cpu_to_le_32(length); rc = bnxt_hwrm_send_message(bp, &req, sizeof(req)); - HWRM_CHECK_RESULT(); - HWRM_UNLOCK(); if (rc == 0) memcpy(data, buf, length); rte_free(buf); + HWRM_CHECK_RESULT(); + HWRM_UNLOCK(); + return rc; } @@ -3204,10 +3204,10 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type, rc = bnxt_hwrm_send_message(bp, &req, sizeof(req)); + rte_free(buf); HWRM_CHECK_RESULT(); HWRM_UNLOCK(); - rte_free(buf); return rc; } -- 2.11.0