mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
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:826eb17271master date: 2013-07-01 15:20:28 +0100 master commit:826eb17271master date: 2013-07-01 15:20:28 +0100
This commit is contained in:
1 parent
75c411d02b
commit
52f527f726
1 file changed
+12
@@ -786,6 +786,18 @@ int libxl__device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcid
|
||||
int num_assigned, i, rc;
|
||||
int stubdomid = 0;
|
||||
|
||||
if (libxl__domain_is_hvm(ctx, domid)) {
|
||||
rc = xc_test_assign_device(ctx->xch, domid, pcidev_value(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;
|
||||
}
|
||||
}
|
||||
|
||||
if (!libxl_pcidev_assignable(ctx, pcidev)) {
|
||||
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device %x:%x:%x.%x is not assignable",
|
||||
pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
|
||||
|
||||