diff options
author | Jan Beulich <jbeulich@suse.com> | 2013-07-09 10:04:04 +0200 |
---|---|---|
committer | Jan Beulich <jbeulich@suse.com> | 2013-07-09 10:04:04 +0200 |
commit | 78748fe8846627ddf3cccdaa3a1ff907a6132568 (patch) | |
tree | dcc14ddafbd328fb4e6a90ece211fb1d0919f0c1 | |
parent | aca0217117922130140f422b6e1b74c76757f304 (diff) | |
download | xen-78748fe8846627ddf3cccdaa3a1ff907a6132568.tar.gz xen-78748fe8846627ddf3cccdaa3a1ff907a6132568.tar.bz2 xen-78748fe8846627ddf3cccdaa3a1ff907a6132568.zip |
libxl: suppress device assignment to HVM guest when there is no IOMMU
This in effect copies similar logic from xend: While there's no way to
check whether a device is assigned to a particular guest,
XEN_DOMCTL_test_assign_device at least allows checking whether an
IOMMU is there and whether a device has been assign to _some_
guest.
For the time being, this should be enough to cover for the missing
error checking/recovery in other parts of libxl's device assignment
paths.
There remains a (functionality-, but not security-related) race in
that the iommu should be set up earlier, but this is too risky a
change for this stage of the 4.3 release.
This is a security issue, XSA-61.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Tested-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
master commit: 826eb17271d3c647516d9944c47b0779afedea25
master date: 2013-07-01 15:20:28 +0100
-rw-r--r-- | tools/libxl/libxl_pci.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index d373b4dd08..2d476e038c 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1048,6 +1048,18 @@ int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcide int num_assigned, i, rc; int stubdomid = 0; + if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) { + rc = xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); + if (rc) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "PCI device %04x:%02x:%02x.%u %s?", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func, + errno == ENOSYS ? "cannot be assigned - no IOMMU" + : "already assigned to a different guest"); + goto out; + } + } + rc = libxl__device_pci_setdefault(gc, pcidev); if (rc) goto out; |