> From: Jan Beulich <jbeul...@suse.com>
> Sent: Monday, April 11, 2022 5:37 PM
>
> While 97af062b89d5 ("IOMMU/x86: maintain a per-device pseudo domain
> ID")
> took care of not making things worse, plugging pre-existing leaks wasn't
> the purpose of that change; they're not security relevant after all.
>
> Signed-off-by: Jan Beulich <jbeul...@suse.com>
Reviewed-by: Kevin Tian <kevin.t...@intel.com>
>
> --- a/xen/drivers/passthrough/vtd/iommu.c
> +++ b/xen/drivers/passthrough/vtd/iommu.c
> @@ -1238,8 +1238,9 @@ int __init iommu_alloc(struct acpi_drhd_
> drhd->iommu = iommu;
>
> iommu->reg = ioremap(drhd->address, PAGE_SIZE);
> + rc = -ENOMEM;
> if ( !iommu->reg )
> - return -ENOMEM;
> + goto free;
> iommu->index = nr_iommus++;
>
> iommu->cap = dmar_readq(iommu->reg, DMAR_CAP_REG);
> @@ -1260,8 +1261,9 @@ int __init iommu_alloc(struct acpi_drhd_
> printk(VTDPREFIX "cap = %"PRIx64" ecap = %"PRIx64"\n",
> iommu->cap, iommu->ecap);
> }
> + rc = -ENODEV;
> if ( !(iommu->cap + 1) || !(iommu->ecap + 1) )
> - return -ENODEV;
> + goto free;
>
> quirk_iommu_caps(iommu);
>
> @@ -1272,7 +1274,8 @@ int __init iommu_alloc(struct acpi_drhd_
> {
> printk(XENLOG_ERR VTDPREFIX "IOMMU: unsupported\n");
> print_iommu_regs(drhd);
> - return -ENODEV;
> + rc = -ENODEV;
> + goto free;
> }
>
> /* Calculate number of pagetable levels: 3 or 4. */
> @@ -1283,7 +1286,8 @@ int __init iommu_alloc(struct acpi_drhd_
> {
> printk(XENLOG_ERR VTDPREFIX "IOMMU: unsupported sagaw %x\n",
> sagaw);
> print_iommu_regs(drhd);
> - return -ENODEV;
> + rc = -ENODEV;
> + goto free;
> }
> iommu->nr_pt_levels = agaw_to_level(agaw);
>
> @@ -1298,8 +1302,9 @@ int __init iommu_alloc(struct acpi_drhd_
> iommu->domid_bitmap = xzalloc_array(unsigned long,
> BITS_TO_LONGS(nr_dom));
> iommu->domid_map = xzalloc_array(domid_t, nr_dom);
> + rc = -ENOMEM;
> if ( !iommu->domid_bitmap || !iommu->domid_map )
> - return -ENOMEM;
> + goto free;
>
> /*
> * If Caching mode is set, then invalid translations are tagged
