On Fri, 2026-07-24 at 07:41 -0400, Michael S. Tsirkin wrote:
> Caution: External email. Do not open attachments or click links, unless this
> email comes from a known sender and you know the content is safe.
>
>
> On Fri, Jul 24, 2026 at 11:15:32AM +0000, Clément MATHIEU--DRIF wrote:
>
> > 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](https://gitlab.com/qemu-project/qemu/-/work_items/3619)
> > Fixes: 6ebe6cf2a066 ("intel_iommu: Process PASID-based iotlb invalidation")
> > Signed-off-by: Clement Mathieu--Drif
> > <[[email protected]](mailto:[email protected])>
> > Reviewed-by: Philippe Mathieu-Daudé
> > <[[email protected]](mailto:[email protected])>
> > Reviewed-by: Zhenzhong Duan
> > <[[email protected]](mailto:[email protected])>
> > ---
>
>
> changelog in the future pls.
Yep, my bad, thanks Michael
>
>
> > hw/i386/intel_iommu.c | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> > index bf4f0f2f6b..8245452d89 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));
> > --
> > 2.54.0
>
>
