[v2] bus/pci: fix TOCTOU issue

Message ID 20190402185105.2852-1-stephen@networkplumber.org
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • [v2] bus/pci: fix TOCTOU issue
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Stephen Hemminger April 2, 2019, 6:51 p.m.
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 <stephen@networkplumber.org>
---
v2 - add more CC to original mail, and rebase

 drivers/bus/pci/linux/pci_uio.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Comments

David Marchand June 14, 2019, 7:16 a.m. | #1
On Tue, Apr 2, 2019 at 8:51 PM Stephen Hemminger <stephen@networkplumber.org>
wrote:

> 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 <stephen@networkplumber.org>
> ---
> v2 - add more CC to original mail, and rebase
>
>  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 09ecbb7aad25..0d1b9aa347ba 100644
> --- a/drivers/bus/pci/linux/pci_uio.c
> +++ b/drivers/bus/pci/linux/pci_uio.c
> @@ -314,12 +314,11 @@ pci_uio_map_resource_by_index(struct rte_pci_device
> *dev, int res_idx,
>                         loc->domain, loc->bus, loc->devid,
>                         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);
>                 }
>         }
>
>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Thomas Monjalon June 14, 2019, 7:35 a.m. | #2
14/06/2019 16:16, David Marchand:
> On Tue, Apr 2, 2019 at 8:51 PM Stephen Hemminger <stephen@networkplumber.org>
> wrote:
> 
> > 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")

Cc: stable@dpdk.org

> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> >
> Reviewed-by: David Marchand <david.marchand@redhat.com>

Applied, thanks

Patch

diff --git a/drivers/bus/pci/linux/pci_uio.c b/drivers/bus/pci/linux/pci_uio.c
index 09ecbb7aad25..0d1b9aa347ba 100644
--- a/drivers/bus/pci/linux/pci_uio.c
+++ b/drivers/bus/pci/linux/pci_uio.c
@@ -314,12 +314,11 @@  pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx,
 			loc->domain, loc->bus, loc->devid,
 			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);
 		}
 	}