[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/31] pci-assign: avoid pointless stat
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 13/31] pci-assign: avoid pointless stat |
Date: |
Tue, 24 Jan 2017 12:39:17 +0300 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/i386/pci-assign-load-rom.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
index 0d8e4b2..fd59076 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;
--
2.1.4
- [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 01/31] doc: don't mention -memory, it is -m, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 12/31] qemu-img: remove dead check, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 15/31] qga: fix erroneous argument to strerror, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 11/31] pcie: fix typo in comments, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 09/31] object.h: spelling fix, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 17/31] hw/i386/kvmvapic: Remove dead code in patch_hypercalls(), Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 13/31] pci-assign: avoid pointless stat,
Michael Tokarev <=
- [Qemu-devel] [PULL 06/31] hw: Fix typos found by codespell, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 02/31] hw/block/m25p80: Fix typo in local macro name, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 31/31] hw/isa/isa-bus: Set category of the "isabus-bridge" device, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 28/31] gdbstub.c: fix GDB connection segfault caused by empty machines, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 16/31] doc/usb2: fix typo, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 25/31] hw/display/framebuffer.c: Avoid overflow for framebuffers > 4GB, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 22/31] util/mmap-alloc: check parameter before using, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 30/31] usb: Set category and description of the MTP device, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 19/31] disas/cris.c: Fix Coverity warning about unchecked NULL, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 03/31] README: Add linux to macOS build info, Michael Tokarev, 2017/01/24