[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/48] ivshmem: fix number of bytes to push to fifo
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL 04/48] ivshmem: fix number of bytes to push to fifo |
Date: |
Tue, 6 Oct 2015 21:19:00 +0200 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH 1/2] tests: Add ivshmem qtest, (continued)
- Re: [Qemu-devel] [PULL 00/48] ivshmem series, Paolo Bonzini, 2015/10/08
- Re: [Qemu-devel] [PULL 00/48] ivshmem series, Andrew Jones, 2015/10/08
- Re: [Qemu-devel] [PULL 00/48] ivshmem series, Andreas Färber, 2015/10/08
- Re: [Qemu-devel] [PULL 00/48] ivshmem series, Peter Maydell, 2015/10/08
- Re: [Qemu-devel] [PULL 00/48] ivshmem series, Marc-André Lureau, 2015/10/08
[Qemu-devel] [PULL 01/48] char: add qemu_chr_free(), marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 03/48] ivhsmem: read do not accept more than sizeof(long), marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 04/48] ivshmem: fix number of bytes to push to fifo,
marcandre . lureau <=
[Qemu-devel] [PULL 26/48] ivshmem: add device description, marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 40/48] glib-compat: add 2.38/2.40/2.46 asserts, marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 46/48] ivshmem: rename MSI eventfd_table, marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 27/48] ivshmem: fix pci_ivshmem_exit(), marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 44/48] ivshmem: add hostmem backend, marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 41/48] tests: add ivshmem qtest, marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 35/48] docs: update ivshmem device spec, marcandre . lureau, 2015/10/08
[Qemu-devel] [PULL 30/48] ivshmem: reset mask on device reset, marcandre . lureau, 2015/10/08