[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 03/10] xen/pt: Check if reg->init function se
From: |
Stefano Stabellini |
Subject: |
Re: [Qemu-devel] [PATCH v2 03/10] xen/pt: Check if reg->init function sets the 'data' past the reg->size |
Date: |
Tue, 8 Sep 2015 16:23:46 +0100 |
User-agent: |
Alpine 2.02 (DEB 1266 2009-07-14) |
On Tue, 8 Sep 2015, Konrad Rzeszutek Wilk wrote:
> 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>
Acked-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 aff51b8..55be4ee 100644
> --- a/hw/xen/xen_pt_config_init.c
> +++ b/hw/xen/xen_pt_config_init.c
> @@ -1912,9 +1912,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;
> --
> 2.1.0
>
- [Qemu-devel] [PATCH v2] Remove XenPTReg->data and use dev.config for guest configuration values., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 10/10] xen/pt: Don't slurp wholesale the PCI configuration registers, Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 09/10] xen/pt: Check for return values for xen_host_pci_[get|set] in init, Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 05/10] xen/pt: Log xen_host_pci_get in two init functions, Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 07/10] xen/pt: Make xen_pt_unregister_device idempotent, Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 08/10] xen/pt: Move bulk of xen_pt_unregister_device in its own routine., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 04/10] xen/pt: Remove XenPTReg->data field., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 02/10] xen/pt: Sync up the dev.config and data values., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 03/10] xen/pt: Check if reg->init function sets the 'data' past the reg->size, Konrad Rzeszutek Wilk, 2015/09/08
- Re: [Qemu-devel] [PATCH v2 03/10] xen/pt: Check if reg->init function sets the 'data' past the reg->size,
Stefano Stabellini <=
- [Qemu-devel] [PATCH v2 06/10] xen/pt: Log xen_host_pci_get/set errors in MSI code., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 01/10] xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config, Konrad Rzeszutek Wilk, 2015/09/08
- Re: [Qemu-devel] [PATCH v2] Remove XenPTReg->data and use dev.config for guest configuration values., Stefano Stabellini, 2015/09/08