diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-03-24 11:05:06 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-03-24 11:05:06 +0000 |
| commit | 6a9ca8b206be15720a1a59185ce5acf333ff72e0 (patch) | |
| tree | ee3976232bd48ece1051400a2f66164124addabc | |
| parent | 0673a21c077510cc09c631557140585304c5ab90 (diff) | |
| download | xen-6a9ca8b206be15720a1a59185ce5acf333ff72e0.tar.gz xen-6a9ca8b206be15720a1a59185ce5acf333ff72e0.tar.bz2 xen-6a9ca8b206be15720a1a59185ce5acf333ff72e0.zip | |
VT-d: avoid faulting in print_iommu_regs()
In c/s 21027 I overlooked that using this function when bad table data
was found requires the function to also do some range checking.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
| -rw-r--r-- | xen/drivers/passthrough/vtd/utils.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index 24bb106b39..8cc89f3c90 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -67,10 +67,13 @@ void print_iommu_regs(struct acpi_drhd_unit *drhd) printk(" CAP = %"PRIx64"\n", cap = dmar_readq(iommu->reg, DMAR_CAP_REG)); printk(" n_fault_reg = %"PRIx64"\n", cap_num_fault_regs(cap)); printk(" fault_recording_offset = %"PRIx64"\n", cap_fault_reg_offset(cap)); - printk(" fault_recording_reg_l = %"PRIx64"\n", - dmar_readq(iommu->reg, cap_fault_reg_offset(cap))); - printk(" fault_recording_reg_h = %"PRIx64"\n", - dmar_readq(iommu->reg, cap_fault_reg_offset(cap) + 8)); + if ( cap_fault_reg_offset(cap) < PAGE_SIZE ) + { + printk(" fault_recording_reg_l = %"PRIx64"\n", + dmar_readq(iommu->reg, cap_fault_reg_offset(cap))); + printk(" fault_recording_reg_h = %"PRIx64"\n", + dmar_readq(iommu->reg, cap_fault_reg_offset(cap) + 8)); + } printk(" ECAP = %"PRIx64"\n", dmar_readq(iommu->reg, DMAR_ECAP_REG)); printk(" GCMD = %x\n", dmar_readl(iommu->reg, DMAR_GCMD_REG)); printk(" GSTS = %x\n", dmar_readl(iommu->reg, DMAR_GSTS_REG)); |