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 63FE8A046B for ; Mon, 24 Jun 2019 17:27:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 573151BCDE; Mon, 24 Jun 2019 17:27:17 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 66A0A1BED9 for ; Mon, 24 Jun 2019 17:27:15 +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 DDF2230BBE9A; Mon, 24 Jun 2019 15:27:14 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 56BB719723; Mon, 24 Jun 2019 15:27:05 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: David Marchand , dpdk stable Date: Mon, 24 Jun 2019 16:25:06 +0100 Message-Id: <20190624152525.19349-42-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-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.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 24 Jun 2019 15:27:14 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/pci: fix TOCTOU for sysfs access' 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 06/27/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/8f54619deab26614e850adbf8a60d33f7c5b4736 Thanks. Kevin Traynor --- >From 8f54619deab26614e850adbf8a60d33f7c5b4736 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 2 Apr 2019 11:51:05 -0700 Subject: [PATCH] bus/pci: fix TOCTOU for sysfs access [ upstream commit c530aa78e3747cdd273310eeb9c50603da7f9cb6 ] Using access followed by open causes a static analysis warning about Time of check versus Time of use. Also, access() and open() have different UID permission checks. This is not a serious problem; but easy to fix by using errno instead. Coverity issue: 300870 Fixes: 4a928ef9f611 ("bus/pci: enable write combining during mapping") Signed-off-by: Stephen Hemminger Reviewed-by: David Marchand --- drivers/bus/pci/linux/pci_uio.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/bus/pci/linux/pci_uio.c b/drivers/bus/pci/linux/pci_uio.c index 09ecbb7aa..0d1b9aa34 100644 --- a/drivers/bus/pci/linux/pci_uio.c +++ b/drivers/bus/pci/linux/pci_uio.c @@ -315,10 +315,9 @@ pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx, loc->function, res_idx); - if (access(devname, R_OK|W_OK) != -1) { - fd = open(devname, O_RDWR); - if (fd < 0) - RTE_LOG(INFO, EAL, "%s cannot be mapped. " - "Fall-back to non prefetchable mode.\n", - devname); + fd = open(devname, O_RDWR); + if (fd < 0 && errno != ENOENT) { + RTE_LOG(INFO, EAL, "%s cannot be mapped. " + "Fall-back to non prefetchable mode.\n", + devname); } } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:57.257645187 +0100 +++ 0042-bus-pci-fix-TOCTOU-for-sysfs-access.patch 2019-06-24 16:18:55.086429925 +0100 @@ -1 +1 @@ -From c530aa78e3747cdd273310eeb9c50603da7f9cb6 Mon Sep 17 00:00:00 2001 +From 8f54619deab26614e850adbf8a60d33f7c5b4736 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c530aa78e3747cdd273310eeb9c50603da7f9cb6 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 65f4896b9..f240fe4f2 100644 +index 09ecbb7aa..0d1b9aa34 100644 @@ -26 +27 @@ -@@ -316,10 +316,9 @@ pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx, +@@ -315,10 +315,9 @@ pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx,