Re: [Qemu-devel] [PATCH v4 25/47] ivshmem: check shm isn't already initialized

[Marc-André Lureau]

Hi

----- Original Message -----
> On 24.09.2015 13:37, address@hidden wrote:
> > From: Marc-André Lureau <address@hidden>
> > 
> > The server should not change the shm, and this isn't handled by qemu.
> 
> "..., and we should verify this in QEMU?"

ok, I'll add that

> 
> > 
> > Signed-off-by: Marc-André Lureau <address@hidden>
> > ---
> >  hw/misc/ivshmem.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
> > index ea80548..21ef260 100644
> > --- a/hw/misc/ivshmem.c
> > +++ b/hw/misc/ivshmem.c
> > @@ -533,6 +533,12 @@ static void ivshmem_read(void *opaque, const uint8_t
> > *buf, int size)
> >      if (incoming_posn == -1) {
> >          void * map_ptr;
> >  
> > +        if (s->shm_fd >= 0) {
> > +            error_report("shm already initialized");
> > +            close(incoming_fd);
> > +            return;
> > +        }
> > +
> >          if (check_shm_size(s, incoming_fd, &err) == -1) {
> >              error_report_err(err);
> >              close(incoming_fd);
> > 
> 
> Reviewed-by: Claudio Fontana <address@hidden>
> 
>