Jan Beulich
2013-May-15 10:22 UTC
[PATCH] x86/shadow: fix off-by-one in MMIO permission check
iomem_access_permitted() wants an inclusive range as input.
Also use pfn_to_paddr() in nearby code instead of open coding it.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -604,13 +604,13 @@ _sh_propagate(struct vcpu *v,
else if ( d->arch.hvm_domain.is_in_uc_mode )
sflags |= pat_type_2_pte_flags(PAT_TYPE_UNCACHABLE);
else
- if ( iomem_access_permitted(d, mfn_x(target_mfn), mfn_x(target_mfn)
+ 1) )
+ if ( iomem_access_permitted(d, mfn_x(target_mfn),
mfn_x(target_mfn)) )
{
if ( p2mt == p2m_mmio_direct )
sflags |= get_pat_flags(v,
gflags,
gfn_to_paddr(target_gfn),
- ((paddr_t)mfn_x(target_mfn)) << PAGE_SHIFT,
+ pfn_to_paddr(mfn_x(target_mfn)),
MTRR_TYPE_UNCACHABLE);
else if ( iommu_snoop )
sflags |= pat_type_2_pte_flags(PAT_TYPE_WRBACK);
@@ -618,7 +618,7 @@ _sh_propagate(struct vcpu *v,
sflags |= get_pat_flags(v,
gflags,
gfn_to_paddr(target_gfn),
- ((paddr_t)mfn_x(target_mfn)) << PAGE_SHIFT,
+ pfn_to_paddr(mfn_x(target_mfn)),
NO_HARDCODE_MEM_TYPE);
}
}
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
Tim Deegan
2013-May-15 10:33 UTC
Re: [PATCH] x86/shadow: fix off-by-one in MMIO permission check
At 11:22 +0100 on 15 May (1368616929), Jan Beulich wrote:> iomem_access_permitted() wants an inclusive range as input. > > Also use pfn_to_paddr() in nearby code instead of open coding it. > > Signed-off-by: Jan Beulich <jbeulich@suse.com>Acked-by: Tim Deegan <tim@xen.org>