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 14D23A0524 for ; Fri, 5 Feb 2021 12:21:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E0344067B; Fri, 5 Feb 2021 12:21:12 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id B2F321606BA for ; Fri, 5 Feb 2021 12:21:10 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id j11so5711663wmi.3 for ; Fri, 05 Feb 2021 03:21:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4JZR58s0VZ02U403CfV4+LZ4Mdl9M9EE9MWV6AXLQ7Y=; b=QdwgcjKuvPuYTCv90945yIXpERDKaGwUuNHTmGziC/YQdFgicjfceeZIq9VUHqXnOl y+4TwYC+3fmI+SZvokfEY8/+H/MZGeqJoNHsbbHnmc4WFnqXVkPqTcyV8DEbmyHo1N+M 7fGBLHiuAnVPXsYkNKZydjrQh1UqEbarUmVr+yFrUecBRD2NGTbUOMFIYtid0I+Dhe89 o6IBmv/gMIl2H0J2DmDooWsT5IIoWs+FxfL03Mvvp6+NGZljaiI4PlD6GCCG9WjYXDg3 9fbM2mbSNf/9t1iQDUPqlzusIDo9cw8yB6Lp1uAuD4wHTPVEKz78BzOlf7BUgi0Vcern 20tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4JZR58s0VZ02U403CfV4+LZ4Mdl9M9EE9MWV6AXLQ7Y=; b=LSw4+JFKTCyszhlev1IGojnCP4pATP1ApXNJz8Duo82wy9lND5JkPGdi960zUlIGHt TmE4en9hitU0YEivEkXqMI5KE3T6YY/ljB5BQ6HO7Ng5p+uwfbPsGlNqejwb483YzEdf f+a2lCzhd7OG4jYfhm+5eoh7ogFjR226g+E3n2eHDPxUEG4dRLvN9ytjfsah6F8BdUFS k1+8aXonzOuICoxSNF6R4NXm3WGlZl/PiTYnYVe4qTgnPz3dp66BW6fH3sAcPf9v7wB0 rn/IM0TZc3BoL8eZiY8ap4o+HcIV5udHD0hC3T1pftqibzXdZxDGyHLVQObBe5mBnGpI yoBQ== X-Gm-Message-State: AOAM532RdtOhPKv3x7G8wbXa4ZUpmDIMLxkgL1psS98Hhs0j7BQto9ci 3qr2lXCeZ8bhcVCp61Zu4KM= X-Google-Smtp-Source: ABdhPJz4gqkuoDqzfvPes4yLUSq8qH+OfW96ddDV/qBKw8m7a73FkRehiNtnk7izTN2KMqpPRbhD9g== X-Received: by 2002:a1c:610b:: with SMTP id v11mr3199982wmb.188.1612524070526; Fri, 05 Feb 2021 03:21:10 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c62sm8263130wme.16.2021.02.05.03.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:21:09 -0800 (PST) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Ajit Khaparde , dpdk stable Date: Fri, 5 Feb 2021 11:15:18 +0000 Message-Id: <20210205111920.1272063-32-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.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 20.11.1 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 20.11.1 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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/91ddfb63bd326a8709350fe9984eab0a766ec47c Thanks. Luca Boccassi --- >From 91ddfb63bd326a8709350fe9984eab0a766ec47c 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 24c33185b4..ebbf504c0c 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -4320,6 +4320,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; @@ -4354,6 +4355,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; @@ -4407,6 +4409,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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:30.731362494 +0000 +++ 0032-net-bnxt-fix-memory-leak-when-mapping-fails.patch 2021-02-05 11:18:28.662688370 +0000 @@ -1 +1 @@ -From b9f0ad21f856b1d577f3369421559582639e53cf Mon Sep 17 00:00:00 2001 +From 91ddfb63bd326a8709350fe9984eab0a766ec47c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b9f0ad21f856b1d577f3369421559582639e53cf ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org