mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
arm/vpci: honor access size when returning an error
Guest can try to read config space using different access sizes: 8, 16, 32, 64 bits. We need to take this into account when we are returning an error back to MMIO handler, otherwise it is possible to provide more data than requested: i.e. guest issues LDRB instruction to read one byte, but we are writing 0xFFFFFFFFFFFFFFFF in the target register. Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com> Signed-off-by: Stewart Hildebrand <stewart.hildebrand@amd.com> Acked-by: Julien Grall <jgrall@amazon.com>
This commit is contained in:
1 parent
2c15fa332e
commit
7db7bd0f31
1 file changed
+3
-1
+3
-1
@@ -29,6 +29,8 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info,
|
||||
{
|
||||
struct pci_host_bridge *bridge = p;
|
||||
pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa);
|
||||
const unsigned int access_size = (1U << info->dabt.size) * 8;
|
||||
const register_t invalid = GENMASK_ULL(access_size - 1, 0);
|
||||
/* data is needed to prevent a pointer cast on 32bit */
|
||||
unsigned long data;
|
||||
|
||||
@@ -39,7 +41,7 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info,
|
||||
return 1;
|
||||
}
|
||||
|
||||
*r = ~0ul;
|
||||
*r = invalid;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||