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 A3A4EA0543 for ; Sat, 5 Nov 2022 18:13:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A48440151; Sat, 5 Nov 2022 18:13:51 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id ACAE3400D5 for ; Sat, 5 Nov 2022 18:13:50 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id 5so4639074wmo.1 for ; Sat, 05 Nov 2022 10:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NqETjSTfWcBriv4fGaVt/MgTmTh1TaFFBJceVeqX5xU=; b=Z8AlaIFIzOcnd+QkJxDrc3u5qdV9KLVsNze751HCYrZvbau7X4lykHhA4DvI8iupk1 XDpf/V3BlH2y+iu/iU12deHWAHQ/dFInZKDM+JoJdcGrmFC0GOdc0kU7vA4HyCV9o4xf JF2YQPX61oz1MQSMGVhe8KvDk75FiG0T3CdGb/mEiw4f9GUr5fsxN4bInS504FfIP56X cZIm0YeyPay/t6y9Jqr9Se0ajeAP69wSuLo/FeB/jIOV6l98RdmzrcbVcjR6KhB7q1+Y WsAtAnPCnoy4IwyxK1RBZNAB6XAJEmpvAqCb9TQ7E/6iRGsrYGOJe6jjswAajIHtT+tA Ip7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NqETjSTfWcBriv4fGaVt/MgTmTh1TaFFBJceVeqX5xU=; b=JdnYCNNBPb6VU8Spyks4S8WZoTndKG/n9vOR93agcXhAwZCMYJc9m6r3cMDZsWuVCM rXGC7THE4mCxSvPuNHQQzGHIe8h6OwQNF+NDFCttEdNfpg55R/xErWC1V0UBcEUWFiXD yG7JRjCJxDGam8i2Q4nt7v9h/7BJB0m6HsCJpfXnvHypCE4v/mt6Du1jsXuuPrath/Wx 7PkAcw+8QblyVptI9lL+6FVyJEgVXoTMcFZKeG+X97CteN+7Txd0eFmysrWhLR5QW3yI Ca1HAmCT6+OvXhCGU2fGrHXG30CmRmjgTSUZE9K2HmUXTJS+cWFDDRfGdOMZLbsZ0Z3M cDxA== X-Gm-Message-State: ACrzQf3GCNtJyGDe1/hEbYu8IqK7vIimFk4hLjYx0VMBJSKFjgx5cVck Vh4rBp9A/uXJSGJkbP74AbY= X-Google-Smtp-Source: AMsMyM5GSWro0mqRq6p58tXXWAxQqgv79KbTz/EGqgUT6JCzUB/iE/AIti/6pdVp/2Fd4jFxXR9QjA== X-Received: by 2002:a1c:3b87:0:b0:3cf:5d41:bf27 with SMTP id i129-20020a1c3b87000000b003cf5d41bf27mr29390592wma.16.1667668430423; Sat, 05 Nov 2022 10:13:50 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id e5-20020adfef05000000b00225307f43fbsm2633626wro.44.2022.11.05.10.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:13:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc100: fix memory leak' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:35 +0000 Message-Id: <20221105171146.1520039-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.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 11/07/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/77b4e2c0daa47da438ebc2ca5ad83c5ef62f964f Thanks. Luca Boccassi --- >From 77b4e2c0daa47da438ebc2ca5ad83c5ef62f964f Mon Sep 17 00:00:00 2001 From: Hernan Vargas Date: Thu, 20 Oct 2022 22:20:36 -0700 Subject: [PATCH] baseband/acc100: fix memory leak [ upstream commit 36341139e48bdefbafcd6e550b9342af096f8be4 ] Moved check for undefined device before allocating queue data structure. Coverity issue: 375803, 375813, 375819, 375827, 375831 Fixes: 060e7672930 ("baseband/acc100: add queue configuration") Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc100/rte_acc100_pmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c index 453343cfb6..5dca9e01d8 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -824,6 +824,10 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, struct acc100_queue *q; int16_t q_idx; + if (d == NULL) { + rte_bbdev_log(ERR, "Undefined device"); + return -ENODEV; + } /* Allocate the queue data structure. */ q = rte_zmalloc_socket(dev->device->driver->name, sizeof(*q), RTE_CACHE_LINE_SIZE, conf->socket); @@ -831,10 +835,6 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, rte_bbdev_log(ERR, "Failed to allocate queue memory"); return -ENOMEM; } - if (d == NULL) { - rte_bbdev_log(ERR, "Undefined device"); - return -ENODEV; - } q->d = d; q->ring_addr = RTE_PTR_ADD(d->sw_rings, (d->sw_ring_size * queue_id)); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:11.874722062 +0000 +++ 0036-baseband-acc100-fix-memory-leak.patch 2022-11-05 17:11:08.790945132 +0000 @@ -1 +1 @@ -From 36341139e48bdefbafcd6e550b9342af096f8be4 Mon Sep 17 00:00:00 2001 +From 77b4e2c0daa47da438ebc2ca5ad83c5ef62f964f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 36341139e48bdefbafcd6e550b9342af096f8be4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - drivers/baseband/acc/rte_acc100_pmd.c | 8 ++++---- + drivers/baseband/acc100/rte_acc100_pmd.c | 8 ++++---- @@ -18,6 +19,6 @@ -diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c -index 7fec2283eb..7500ef6eb5 100644 ---- a/drivers/baseband/acc/rte_acc100_pmd.c -+++ b/drivers/baseband/acc/rte_acc100_pmd.c -@@ -663,6 +663,10 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, - struct acc_queue *q; +diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c +index 453343cfb6..5dca9e01d8 100644 +--- a/drivers/baseband/acc100/rte_acc100_pmd.c ++++ b/drivers/baseband/acc100/rte_acc100_pmd.c +@@ -824,6 +824,10 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, + struct acc100_queue *q; @@ -33 +34 @@ -@@ -670,10 +674,6 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, +@@ -831,10 +835,6 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,