[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/29] xen/pt: Check if reg->init function sets the '
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 22/29] xen/pt: Check if reg->init function sets the 'data' past the reg->size |
Date: |
Thu, 10 Sep 2015 18:15:54 +0100 |
From: Konrad Rzeszutek Wilk <address@hidden>
It should never happen, but in case it does (an developer adds
a new register and the 'init_val' expands past the register
size) we want to report. The code will only write up to
reg->size so there is no runtime danger of the register spilling
across other ones - however to catch this sort of thing
we still return an error.
Signed-off-by: Konrad Rzeszutek Wilk <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>
---
hw/xen/xen_pt_config_init.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index b1ad743..b58bf39 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -1949,9 +1949,15 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState
*s,
} else
val = data;
+ if (val & ~size_mask) {
+ XEN_PT_ERR(&s->dev,"Offset 0x%04x:0x%04x expands past register
size(%d)!\n",
+ offset, val, reg->size);
+ g_free(reg_entry);
+ return -ENXIO;
+ }
/* This could be just pci_set_long as we don't modify the bits
- * past reg->size, but in case this routine is run in parallel
- * we do not want to over-write other registers. */
+ * past reg->size, but in case this routine is run in parallel or the
+ * init value is larger, we do not want to over-write registers. */
switch (reg->size) {
case 1: pci_set_byte(s->dev.config + offset, (uint8_t)val);
break;
--
1.7.10.4
- [Qemu-devel] [PULL 02/29] i440fx: make types configurable at run-time, (continued)
- [Qemu-devel] [PULL 02/29] i440fx: make types configurable at run-time, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 03/29] pc_init1: pass parameters just with types, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 07/29] xen, gfx passthrough: retrieve VGA BIOS to work, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 05/29] hw/pci-assign: split pci-assign.c, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 09/29] xen, gfx passthrough: register a isa bridge, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 06/29] xen, gfx passthrough: basic graphics passthrough support, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 08/29] igd gfx passthrough: create a isa bridge, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 26/29] xen/pt: Make xen_pt_unregister_device idempotent, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 13/29] xen/HVM: atomically access pointers in bufioreq handling, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 12/29] xen-hvm: When using xc_domain_add_to_physmap also include errno when reporting, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 22/29] xen/pt: Check if reg->init function sets the 'data' past the reg->size,
Stefano Stabellini <=
- [Qemu-devel] [PULL 28/29] xen/pt: Check for return values for xen_host_pci_[get|set] in init, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Stefano Stabellini, 2015/09/10
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Paolo Bonzini, 2015/09/14
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Stefano Stabellini, 2015/09/15
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Konrad Rzeszutek Wilk, 2015/09/15
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Stefano Stabellini, 2015/09/15
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Paolo Bonzini, 2015/09/15
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Konrad Rzeszutek Wilk, 2015/09/15
[Qemu-devel] [PULL 14/29] xen/pt: Update comments with proper function name., Stefano Stabellini, 2015/09/10
[Qemu-devel] [PULL 25/29] xen/pt: Log xen_host_pci_get/set errors in MSI code., Stefano Stabellini, 2015/09/10