]> xenbits.xensource.com Git - people/tklengyel/xen.git/commitdiff
IOMMU: make domctl handler tolerate NULL domain
authorJan Beulich <jbeulich@suse.com>
Tue, 26 Apr 2022 08:25:54 +0000 (10:25 +0200)
committerJan Beulich <jbeulich@suse.com>
Tue, 26 Apr 2022 08:25:54 +0000 (10:25 +0200)
Besides the reporter's issue of hitting a NULL deref when !CONFIG_GDBSX,
XEN_DOMCTL_test_assign_device can legitimately end up having NULL passed
here, when the domctl was passed DOMID_INVALID.

Fixes: 71e617a6b8f6 ("use is_iommu_enabled() where appropriate...")
Reported-by: Cheyenne Wills <cheyenne.wills@gmail.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Juergen Gross <jgross@suse.com>
xen/drivers/passthrough/iommu.c

index 1109a865321f051f23289b182b0ed739ff33c299..67ffe6635e98c1767e5501bdc9dec3e3576306d8 100644 (file)
@@ -568,7 +568,7 @@ int iommu_do_domctl(
 {
     int ret = -ENODEV;
 
-    if ( !is_iommu_enabled(d) )
+    if ( !(d ? is_iommu_enabled(d) : iommu_enabled) )
         return -EOPNOTSUPP;
 
 #ifdef CONFIG_HAS_PCI