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 9B37FA0542 for ; Fri, 11 Nov 2022 11:35:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9713542D11; Fri, 11 Nov 2022 11:35:05 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 80FE840150 for ; Fri, 11 Nov 2022 11:35:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xMWYXwxosGOlu4O2pCG6f9E28vCoNE/JKITrzukwAs8=; b=Nmuckk9/JmTxKknRtbKBPQU/UW0gSYeg7gfo/tqLdrnGwvIzHzlP3V5dmGYuxSfQTYVDzK w4/LJ4lqgIbjPpFYMte08J4D4Z3EbgunPvcVzZn2Ovwfssq1yRz1JwOKA0VKCH2jzTIPDp ESaDnZ6JZjMFvTw7qT2FiSZ02oKp0gE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-510-jwHWqs2DN8W2-ARZtl28Jg-1; Fri, 11 Nov 2022 05:34:59 -0500 X-MC-Unique: jwHWqs2DN8W2-ARZtl28Jg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 89D238027EA; Fri, 11 Nov 2022 10:34:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10E772022EA2; Fri, 11 Nov 2022 10:34:57 +0000 (UTC) From: Kevin Traynor To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc100: fix memory leak' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:27 +0000 Message-Id: <20221111103337.307408-37-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.3 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/14/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/da8a0493be38ea2ea83267dee688e422778ae396 Thanks. Kevin --- >From da8a0493be38ea2ea83267dee688e422778ae396 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 6cdc6e65f7..9add3056ab 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -825,4 +825,8 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, 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), @@ -832,8 +836,4 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, return -ENOMEM; } - if (d == NULL) { - rte_bbdev_log(ERR, "Undefined device"); - return -ENODEV; - } q->d = d; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.948073944 +0000 +++ 0037-baseband-acc100-fix-memory-leak.patch 2022-11-11 10:32:17.107300901 +0000 @@ -1 +1 @@ -From 36341139e48bdefbafcd6e550b9342af096f8be4 Mon Sep 17 00:00:00 2001 +From da8a0493be38ea2ea83267dee688e422778ae396 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,5 +19,5 @@ -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 -@@ -664,4 +664,8 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, +diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c +index 6cdc6e65f7..9add3056ab 100644 +--- a/drivers/baseband/acc100/rte_acc100_pmd.c ++++ b/drivers/baseband/acc100/rte_acc100_pmd.c +@@ -825,4 +825,8 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, @@ -31 +32 @@ -@@ -671,8 +675,4 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, +@@ -832,8 +836,4 @@ acc100_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,