summary refs log tree commit diff stats
path: root/hw/i386/pci-assign-load-rom.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-01-04 16:05:25 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2017-01-24 23:26:53 +0300
commit9ed2690354e65a87b830f197cac0138e842f989e (patch)
treec068465296cef233a26e14a4c8dfe19a478dd967 /hw/i386/pci-assign-load-rom.c
parentece9086eb5e3f05e6a3ebb2ec3242932c3b37963 (diff)
downloadfocaccia-qemu-9ed2690354e65a87b830f197cac0138e842f989e.tar.gz
focaccia-qemu-9ed2690354e65a87b830f197cac0138e842f989e.zip
pci-assign: avoid pointless stat
Just check the errno value after fopen and follow it with fstat.
This shuts up Coverity's complaint about TOC/TOU violation.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw/i386/pci-assign-load-rom.c')
-rw-r--r--hw/i386/pci-assign-load-rom.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
index 0d8e4b2826..fd59076e7a 100644
--- a/hw/i386/pci-assign-load-rom.c
+++ b/hw/i386/pci-assign-load-rom.c
@@ -39,19 +39,19 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner,
              "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/rom",
              domain, bus, slot, function);
 
-    if (stat(rom_file, &st)) {
-        if (errno != ENOENT) {
-            error_report("pci-assign: Invalid ROM.");
-        }
-        return NULL;
-    }
-
     /* Write "1" to the ROM file to enable it */
     fp = fopen(rom_file, "r+");
     if (fp == NULL) {
-        error_report("pci-assign: Cannot open %s: %s", rom_file, strerror(errno));
+        if (errno != ENOENT) {
+            error_report("pci-assign: Cannot open %s: %s", rom_file, strerror(errno));
+        }
         return NULL;
     }
+    if (fstat(fileno(fp), &st) == -1) {
+        error_report("pci-assign: Cannot stat %s: %s", rom_file, strerror(errno));
+        goto close_rom;
+    }
+
     val = 1;
     if (fwrite(&val, 1, 1, fp) != 1) {
         goto close_rom;