From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CECF7A04DD for ; Wed, 28 Oct 2020 11:55:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C770FCAAE; Wed, 28 Oct 2020 11:55:23 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 669AECAAB for ; Wed, 28 Oct 2020 11:55:22 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id i1so5205610wro.1 for ; Wed, 28 Oct 2020 03:55:22 -0700 (PDT) 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=Fj2LQ9fRBDSE9IeFoIh25kZka3cTXUBKLMTBaUOrHVM=; b=c0lCU9Z3ltBjyqAa10V63WBs87bdra3KgVrU//4e1oy47jJrFykbPCnWCk+j23AqV9 ElAp6bjfWlzdfuixuSkKcsbG3W/6nAXcnjaB0qQgzPDN6UURREGWyeIyUMKnhShHyHuP BrBD7pwBl6vn0HCplL5hR48r1zn1Is03/VqbJDEjMdc/XWAkjyoEx+epo2VFwVJsBXNA i33Upx5MWGk+kW7yZwL7H8dGnP0kse8HVO+pJqY3sGmWq76SFabF8Y/nVvZwK7oOQtEv AVgP8v2+c7LDW291mxHGOODfYFeq34EOEABIRqsTxOVtqDds67d+LXDSaMGrhTbclgRw mPyg== 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=Fj2LQ9fRBDSE9IeFoIh25kZka3cTXUBKLMTBaUOrHVM=; b=WNfbMUCod5BsAheidPWK6Ye102LlK/bb4O1uqdiy1xOvZSv8vnz4pjNq9bJozDzjJf 9FbAUVqJROmuaBNLSyNoykHnMXuv++6DMMc3H58pdZQWFKGL6SvrzmnsSl24BXYSadyJ Bk9vPPVC2PWd5jQpNaNcbVr01kWKH0E3PZQGzGxk+LhSJD3Ir6UxLzeeejgIMfRa86ny 2K2hzsWK4cjCaRGE+N8TCQe8ynpCWzjw7ul56/yXkPdOhprXG1/cSG1tJUOyKKaMEQOQ n8TtAxVAG+bnF7eLfcUwLaHxholopLKYcHRGQOXLfePbCRkM5H9TypItPtNzlIAEIhxz 8RbQ== X-Gm-Message-State: AOAM531asuiEVzu2/5DeWbfsJbpK0Iw2sgaLsacYCKeLpjcjs35j6AY+ Pae45B9+O6t62hAASMI1I30= X-Google-Smtp-Source: ABdhPJxZuAzO0UxVR4z+vFsId87RACBQaLr7g39rLRmk3+UgaEkyq1cKhlHBbhYdLPH/N8o1UHzs7w== X-Received: by 2002:a5d:688c:: with SMTP id h12mr8460902wru.92.1603882521129; Wed, 28 Oct 2020 03:55:21 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g8sm6296842wma.36.2020.10.28.03.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:55:20 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Jerin Jacob , dpdk stable Date: Wed, 28 Oct 2020 10:45:33 +0000 Message-Id: <20201028104606.3504127-174-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx2: remove useless check before free' has been queued to stable release 19.11.6 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From 27fb25749f55e70beb2963a7a4f85982f5425a18 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 9 Oct 2020 20:39:05 +0800 Subject: [PATCH] net/octeontx2: remove useless check before free [ upstream commit 29892e064c1813927195fdbb7d80aede1ccd017d ] The glibc free allows free(NULL) as null operation, so remove this useless null checks. Coverity issue: 357719 Fixes: da138cd47e06 ("net/octeontx2: handle port reconfigure") Signed-off-by: Yunjian Wang Acked-by: Jerin Jacob --- drivers/net/octeontx2/otx2_ethdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c index 41930c5df0..c952373be4 100644 --- a/drivers/net/octeontx2/otx2_ethdev.c +++ b/drivers/net/octeontx2/otx2_ethdev.c @@ -1170,10 +1170,8 @@ nix_store_queue_cfg_and_then_release(struct rte_eth_dev *eth_dev) return 0; fail: - if (tx_qconf) - free(tx_qconf); - if (rx_qconf) - free(rx_qconf); + free(tx_qconf); + free(rx_qconf); return -ENOMEM; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:17.121309085 +0000 +++ 0174-net-octeontx2-remove-useless-check-before-free.patch 2020-10-28 10:35:11.780834087 +0000 @@ -1,14 +1,15 @@ -From 29892e064c1813927195fdbb7d80aede1ccd017d Mon Sep 17 00:00:00 2001 +From 27fb25749f55e70beb2963a7a4f85982f5425a18 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 9 Oct 2020 20:39:05 +0800 Subject: [PATCH] net/octeontx2: remove useless check before free +[ upstream commit 29892e064c1813927195fdbb7d80aede1ccd017d ] + The glibc free allows free(NULL) as null operation, so remove this useless null checks. Coverity issue: 357719 Fixes: da138cd47e06 ("net/octeontx2: handle port reconfigure") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Jerin Jacob @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c -index 03d81faef1..b69b92bf58 100644 +index 41930c5df0..c952373be4 100644 --- a/drivers/net/octeontx2/otx2_ethdev.c +++ b/drivers/net/octeontx2/otx2_ethdev.c -@@ -1383,10 +1383,8 @@ nix_store_queue_cfg_and_then_release(struct rte_eth_dev *eth_dev) +@@ -1170,10 +1170,8 @@ nix_store_queue_cfg_and_then_release(struct rte_eth_dev *eth_dev) return 0; fail: