From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgBr-00070r-D5 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:43:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgBp-0001CH-Dx for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:43:11 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:33891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgBp-0001CA-8g for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:43:09 -0400 Received: by padhy16 with SMTP id hy16so158195117pad.1 for ; Mon, 12 Oct 2015 09:43:08 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Mon, 12 Oct 2015 18:40:59 +0200 Message-Id: <1444668104-22955-6-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v2 05/50] ivshmem: fix number of bytes to push to fifo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca 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 Reviewed-by: Claudio Fontana --- 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; -- 2.4.3