From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 979C7A0524 for ; Thu, 4 Feb 2021 12:30:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3AEA24073C; Thu, 4 Feb 2021 12:30:35 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id EEDA524071E for ; Thu, 4 Feb 2021 12:30:33 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cqH-000545-1H; Thu, 04 Feb 2021 11:30:33 +0000 From: Christian Ehrhardt To: Yunjian Wang Cc: Ajit Khaparde , dpdk stable Date: Thu, 4 Feb 2021 12:27:47 +0100 Message-Id: <20210204112954.2488123-12-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix memory leak when mapping fails' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/7d736428549de774906fe4bedaa9614fe3374aca Thanks. Christian Ehrhardt --- >From 7d736428549de774906fe4bedaa9614fe3374aca Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 1 Dec 2020 08:59:34 +0800 Subject: [PATCH] net/bnxt: fix memory leak when mapping fails [ upstream commit b9f0ad21f856b1d577f3369421559582639e53cf ] We allocated memory for the 'buf' when sending message to HWRM, but we don't free it when mapping the address to IO address fails. It will lead to memory leak. Fixes: 19e6af01bb36 ("net/bnxt: support get/set EEPROM") Signed-off-by: Yunjian Wang Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 5e7b7f006c..d87605f7d7 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -3888,6 +3888,7 @@ int bnxt_get_nvram_directory(struct bnxt *bp, uint32_t len, uint8_t *data) return -ENOMEM; dma_handle = rte_malloc_virt2iova(buf); if (dma_handle == RTE_BAD_IOVA) { + rte_free(buf); PMD_DRV_LOG(ERR, "unable to map response address to physical memory\n"); return -ENOMEM; @@ -3922,6 +3923,7 @@ int bnxt_hwrm_get_nvram_item(struct bnxt *bp, uint32_t index, dma_handle = rte_malloc_virt2iova(buf); if (dma_handle == RTE_BAD_IOVA) { + rte_free(buf); PMD_DRV_LOG(ERR, "unable to map response address to physical memory\n"); return -ENOMEM; @@ -3975,6 +3977,7 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type, dma_handle = rte_malloc_virt2iova(buf); if (dma_handle == RTE_BAD_IOVA) { + rte_free(buf); PMD_DRV_LOG(ERR, "unable to map response address to physical memory\n"); return -ENOMEM; -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:28.695437181 +0100 +++ 0012-net-bnxt-fix-memory-leak-when-mapping-fails.patch 2021-02-04 12:04:27.822789527 +0100 @@ -1 +1 @@ -From b9f0ad21f856b1d577f3369421559582639e53cf Mon Sep 17 00:00:00 2001 +From 7d736428549de774906fe4bedaa9614fe3374aca Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b9f0ad21f856b1d577f3369421559582639e53cf ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 24c33185b4..ebbf504c0c 100644 +index 5e7b7f006c..d87605f7d7 100644 @@ -23 +24 @@ -@@ -4320,6 +4320,7 @@ int bnxt_get_nvram_directory(struct bnxt *bp, uint32_t len, uint8_t *data) +@@ -3888,6 +3888,7 @@ int bnxt_get_nvram_directory(struct bnxt *bp, uint32_t len, uint8_t *data) @@ -31 +32 @@ -@@ -4354,6 +4355,7 @@ int bnxt_hwrm_get_nvram_item(struct bnxt *bp, uint32_t index, +@@ -3922,6 +3923,7 @@ int bnxt_hwrm_get_nvram_item(struct bnxt *bp, uint32_t index, @@ -39 +40 @@ -@@ -4407,6 +4409,7 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type, +@@ -3975,6 +3977,7 @@ int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type,