Commit 0691bb257a for qemu.org

commit 0691bb257a7cbfd62127208b49988705bfa2dfe8
Author: Clément MATHIEU--DRIF <clement.mathieu--drif@bull.com>
Date:   Fri Jul 24 11:15:32 2026 +0000

    intel_iommu: Check address mask before using it in pasid-based iotlb invalidation

    Prevent a buggy driver to execute malformed invalidation operations.

    Add the same assert as in vtd_iotlb_page_invalidate.

    Link: https://gitlab.com/qemu-project/qemu/-/work_items/3619
    Fixes: 6ebe6cf2a066 ("intel_iommu: Process PASID-based iotlb invalidation")
    Reported-by: huntr bubble <bubblehuntr@gmail.com>
    Signed-off-by: Clement Mathieu--Drif <clement.mathieu--drif@bull.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
    Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
    Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Message-ID: <20260724111424.376680-1-clement.mathieu--drif@bull.com>

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index d1af7a3135..82c3c3b2c3 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -3021,6 +3021,8 @@ static void vtd_piotlb_page_invalidate(IntelIOMMUState *s, uint16_t domain_id,
 {
     VTDIOTLBPageInvInfo info;

+    assert(am <= VTD_MAMV);
+
     info.domain_id = domain_id;
     info.pasid = pasid;
     info.addr = addr;
@@ -3060,6 +3062,13 @@ static bool vtd_process_piotlb_desc(IntelIOMMUState *s,

     case VTD_INV_DESC_PIOTLB_PSI_IN_PASID:
         am = VTD_INV_DESC_PIOTLB_AM(inv_desc->val[1]);
+        if (am > VTD_MAMV) {
+            error_report_once("%s: invalid piotlb inv desc: hi=0x%"PRIx64
+                              ", lo=0x%"PRIx64" (am=%u > VTD_MAMV=%llu)",
+                              __func__, inv_desc->val[1], inv_desc->val[0],
+                              am, VTD_MAMV);
+            return false;
+        }
         addr = (hwaddr) VTD_INV_DESC_PIOTLB_ADDR(inv_desc->val[1]);
         vtd_piotlb_page_invalidate(s, domain_id, pasid, addr, am,
                                    VTD_INV_DESC_PIOTLB_IH(inv_desc));