On 13/11/2019 13:41, Andrew Cooper wrote:
> c/s bb038f31168 "AMD/IOMMU: replace INTREMAP_ENTRIES" introduces a call to
> intremap_table_entries() in dump_intremap_table() before tbl.ptr is checked
> for NULL.
>
> intremap_table_entries() internally uses virt_to_page() which falls over
>
> ASSERT(va >= XEN_VIRT_START);
>
> in __virt_to_page().
>
> Signed-off-by: Andrew Cooper
> ---
> CC: Jan Beulich
> CC: Juergen Gross
>
> For 4.13. Regression vs 4.12
Oops sorry. Should have had a Reported-by: Igor Druzhinin
Fixed up locally
~Andrew
> ---
> xen/drivers/passthrough/amd/iommu_intr.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/xen/drivers/passthrough/amd/iommu_intr.c
> b/xen/drivers/passthrough/amd/iommu_intr.c
> index 1eed60f265..5e92c023f8 100644
> --- a/xen/drivers/passthrough/amd/iommu_intr.c
> +++ b/xen/drivers/passthrough/amd/iommu_intr.c
> @@ -847,11 +847,13 @@ static void dump_intremap_table(const struct amd_iommu
> *iommu,
> union irte_cptr tbl,
> const struct ivrs_mappings *ivrs_mapping)
> {
> -unsigned int count, nr = intremap_table_entries(tbl.ptr, iommu);
> +unsigned int count, nr;
>
> if ( !tbl.ptr )
> return;
>
> +nr = intremap_table_entries(tbl.ptr, iommu);
> +
> for ( count = 0; count < nr; count++ )
> {
> if ( iommu->ctrl.ga_en
___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
