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 EDFC3A0613 for ; Wed, 28 Aug 2019 15:43:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E199C1C206; Wed, 28 Aug 2019 15:43:31 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 25B171C229 for ; Wed, 28 Aug 2019 15:43:30 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 990271893FB1; Wed, 28 Aug 2019 13:43:29 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B244196AE; Wed, 28 Aug 2019 13:43:28 +0000 (UTC) From: Kevin Traynor To: Herakliusz Lipiec Cc: Beilei Xing , dpdk stable Date: Wed, 28 Aug 2019 14:42:09 +0100 Message-Id: <20190828134234.20547-33-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Wed, 28 Aug 2019 13:43:29 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix MAC removal check' has been queued to LTS release 18.11.3 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 LTS release 18.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 09/04/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/37f15b0450c8b909887d45a144df8355097382dd Thanks. Kevin Traynor --- >From 37f15b0450c8b909887d45a144df8355097382dd Mon Sep 17 00:00:00 2001 From: Herakliusz Lipiec Date: Thu, 18 Jul 2019 15:44:48 +0100 Subject: [PATCH] net/i40e: fix MAC removal check [ upstream commit 73bd0ad5936de7a3152850b22f0d08e5c7bd1f5a ] Add return value check for i40e_vsi_delete_mac call in rte_pmd_i40e_remove_vf_mac_addr as per coverity issue. Coverity issue: 277224 Fixes: e0cb96204b71 ("net/i40e: add support for representor ports") Signed-off-by: Herakliusz Lipiec Acked-by: Beilei Xing --- drivers/net/i40e/rte_pmd_i40e.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c index c49c872b6..f21c76089 100644 --- a/drivers/net/i40e/rte_pmd_i40e.c +++ b/drivers/net/i40e/rte_pmd_i40e.c @@ -581,4 +581,5 @@ rte_pmd_i40e_remove_vf_mac_addr(uint16_t port, uint16_t vf_id, struct i40e_vsi *vsi; struct i40e_pf *pf; + int ret; if (i40e_validate_mac_addr((u8 *)mac_addr) != I40E_SUCCESS) @@ -609,6 +610,7 @@ rte_pmd_i40e_remove_vf_mac_addr(uint16_t port, uint16_t vf_id, /* Remove the mac */ - i40e_vsi_delete_mac(vsi, mac_addr); - + ret = i40e_vsi_delete_mac(vsi, mac_addr); + if (ret != I40E_SUCCESS) + return ret; return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:33.762758660 +0100 +++ 0034-net-i40e-fix-MAC-removal-check.patch 2019-08-28 14:32:31.662956892 +0100 @@ -1 +1 @@ -From 73bd0ad5936de7a3152850b22f0d08e5c7bd1f5a Mon Sep 17 00:00:00 2001 +From 37f15b0450c8b909887d45a144df8355097382dd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 73bd0ad5936de7a3152850b22f0d08e5c7bd1f5a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 24281c293..4c3c7088a 100644 +index c49c872b6..f21c76089 100644 @@ -23 +24 @@ -@@ -582,4 +582,5 @@ rte_pmd_i40e_remove_vf_mac_addr(uint16_t port, uint16_t vf_id, +@@ -581,4 +581,5 @@ rte_pmd_i40e_remove_vf_mac_addr(uint16_t port, uint16_t vf_id, @@ -29 +30 @@ -@@ -610,6 +611,7 @@ rte_pmd_i40e_remove_vf_mac_addr(uint16_t port, uint16_t vf_id, +@@ -609,6 +610,7 @@ rte_pmd_i40e_remove_vf_mac_addr(uint16_t port, uint16_t vf_id,