From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 986ABA0679 for ; Tue, 30 Apr 2019 19:02:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8AE635A6E; Tue, 30 Apr 2019 19:02:05 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E12845F0D for ; Tue, 30 Apr 2019 19:02:03 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5275D80467; Tue, 30 Apr 2019 17:02:03 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A2506D0AE; Tue, 30 Apr 2019 17:02:00 +0000 (UTC) From: Kevin Traynor To: Alejandro Lucero Cc: dpdk stable Date: Tue, 30 Apr 2019 18:01:06 +0100 Message-Id: <20190430170133.2331-11-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 30 Apr 2019 17:02:03 +0000 (UTC) Subject: [dpdk-stable] patch 'net/nfp: fix file descriptor check' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/07/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 can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 879ff47425747012e59a9172f7f9adf6d33e8241 Mon Sep 17 00:00:00 2001 From: Alejandro Lucero Date: Mon, 8 Apr 2019 10:20:40 +0100 Subject: [PATCH] net/nfp: fix file descriptor check [ upstream commit 0c08589d9eeaef341e154b2ddbc29699dbd16e17 ] Although it is rather unlikely getting 0 as the descriptor handle, better to contemplate that possibility. Coverity issue: 195018 Fixes: 896c265ef954 ("net/nfp: use new CPP interface") Signed-off-by: Alejandro Lucero --- drivers/net/nfp/nfp_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 99c9b46e8..49d4e2bd5 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -3036,5 +3036,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name); fw_f = open(fw_name, O_RDONLY); - if (fw_f > 0) + if (fw_f >= 0) goto read_fw; @@ -3045,5 +3045,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name); fw_f = open(fw_name, O_RDONLY); - if (fw_f > 0) + if (fw_f >= 0) goto read_fw; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:14.338450234 +0100 +++ 0011-net-nfp-fix-file-descriptor-check.patch 2019-04-30 17:58:13.769140557 +0100 @@ -1 +1 @@ -From 0c08589d9eeaef341e154b2ddbc29699dbd16e17 Mon Sep 17 00:00:00 2001 +From 879ff47425747012e59a9172f7f9adf6d33e8241 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0c08589d9eeaef341e154b2ddbc29699dbd16e17 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 3e6178c7b..50058e056 100644 +index 99c9b46e8..49d4e2bd5 100644 @@ -22 +23 @@ -@@ -3492,5 +3492,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) +@@ -3036,5 +3036,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) @@ -29 +30 @@ -@@ -3501,5 +3501,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) +@@ -3045,5 +3045,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)