From: Alex Williamson <alex.williamson@xxxxxxxxxx>
Markus Armbruster points out that we're missing a < 0 check
from pread while trying to probe for pci-sysfs io-port
resource support. We don't expect a short read, but we
should harden the test to abort if we get one so we're not
potentially looking at a stale errno.
Signed-off-by: Alex Williamson <alex.williamson@xxxxxxxxxx>
Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>
(cherry picked from commit 1d1c8a498b7ce5c5636f1014f7ad18aa4e1acc0a)
Signed-off-by: Andreas Färber <afaerber@xxxxxxx>
---
hw/device-assignment.c | 5 +++--
1 Datei geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index c4c2535..d586ce4 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -618,8 +618,9 @@ static int assigned_dev_register_regions(PCIRegion *io_regions,
* kernels return EIO. New kernels only allow 1/2/4 byte reads
* so should return EINVAL for a 3 byte read */
ret = pread(pci_dev->v_addrs[i].region->resource_fd, &val, 3, 0);
- if (ret == 3) {
- fprintf(stderr, "I/O port resource supports 3 byte read?!\n");
+ if (ret >= 0) {
+ fprintf(stderr, "Unexpected return from I/O port read: %d\n",
+ ret);
abort();
} else if (errno != EINVAL) {
fprintf(stderr, "Using raw in/out ioport access (sysfs - %s)\n",
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
