[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 03/10] xen/pt: Check if reg->init function se
From: |
Konrad Rzeszutek Wilk |
Subject: |
Re: [Qemu-devel] [PATCH v1 03/10] xen/pt: Check if reg->init function sets the 'data' past the reg->size |
Date: |
Fri, 17 Jul 2015 12:47:12 -0400 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Fri, Jul 17, 2015 at 05:03:44PM +0100, Stefano Stabellini wrote:
> On Thu, 2 Jul 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>
> > ---
> > 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 3938afd..09309ba 100644
> > --- a/hw/xen/xen_pt_config_init.c
> > +++ b/hw/xen/xen_pt_config_init.c
> > @@ -1904,9 +1904,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;
> > + }
>
> If we worry about changes to init_val, wouldn't it be better to add
> QEMU_BUILD_BUG_ON(data & ~size_mask)?
Duh. Yes :-)
>
>
> > /* 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;
> > case 2: pci_set_word(s->dev.config + offset, (uint16_t)val); break;
> > --
> > 2.1.0
> >
- [Qemu-devel] [PATCH v1] Remove XenPTReg->data and use dev.config for guest configuration values., Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 01/10] xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config, Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 04/10] xen/pt: Use xen_host_pci_get_[byte, word, long] instead of xen_host_pci_get_long, Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 10/10] xen/pt: Check for return values for xen_host_pci_[get|set] in init, Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 08/10] xen/pt: Make xen_pt_unregister_device idempotent, Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 03/10] xen/pt: Check if reg->init function sets the 'data' past the reg->size, Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 06/10] xen/pt: Log xen_host_pci_get in two init functions, Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 05/10] xen/pt: Remove XenPTReg->data field., Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 02/10] xen/pt: Sync up the dev.config and data values., Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 09/10] xen/pt: Move bulk of xen_pt_unregister_device in its own routine., Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH v1 07/10] xen/pt: Log xen_host_pci_get/set errors in MSI code., Konrad Rzeszutek Wilk, 2015/07/02
- [Qemu-devel] [PATCH] Follow-on to Remove XenPTReg->data and use dev.config for guest configuration values., Konrad Rzeszutek Wilk, 2015/07/08