From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZguD7-0003ft-EJ for qemu-devel@nongnu.org; Tue, 29 Sep 2015 08:40:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZguD3-0003Mz-QX for qemu-devel@nongnu.org; Tue, 29 Sep 2015 08:40:45 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:41459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZguD3-0003CT-91 for qemu-devel@nongnu.org; Tue, 29 Sep 2015 08:40:41 -0400 References: <1443094669-4144-1-git-send-email-marcandre.lureau@redhat.com> <1443094669-4144-5-git-send-email-marcandre.lureau@redhat.com> From: Claudio Fontana Message-ID: <560A86BE.9090602@huawei.com> Date: Tue, 29 Sep 2015 14:40:30 +0200 MIME-Version: 1.0 In-Reply-To: <1443094669-4144-5-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 04/47] ivshmem: fix number of bytes to push to fifo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: pbonzini@redhat.com, drjones@redhat.com, cam@cs.ualberta.ca, stefanha@redhat.com On 24.09.2015 13:37, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > If the fifo has 0 bytes, and the read is of size 1, the call to > fifo8_push_all() will copy off boundary data. > > Signed-off-by: Marc-André Lureau > --- > hw/misc/ivshmem.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c > index fb53b3f..2162d02 100644 > --- a/hw/misc/ivshmem.c > +++ b/hw/misc/ivshmem.c > @@ -455,7 +455,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) > uint32_t num; > > IVSHMEM_DPRINTF("short read of %d bytes\n", size); > - num = MAX(size, sizeof(long) - fifo8_num_used(&s->incoming_fifo)); > + num = MIN(size, sizeof(long) - fifo8_num_used(&s->incoming_fifo)); > fifo8_push_all(&s->incoming_fifo, buf, num); > if (fifo8_num_used(&s->incoming_fifo) < sizeof(incoming_posn)) { > return; > Reviewed-by: Claudio Fontana