[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 05/50] ivshmem: fix number of bytes to push to fif
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v2 05/50] ivshmem: fix number of bytes to push to fifo |
Date: |
Mon, 12 Oct 2015 18:40:59 +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
- [Qemu-devel] [PULL v2 00/50] Ivshmem patches, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 02/50] char: add qemu_chr_free(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 03/50] msix: add VMSTATE_MSIX_TEST, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 04/50] ivhsmem: read do not accept more than sizeof(long), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 05/50] ivshmem: fix number of bytes to push to fifo,
marcandre . lureau <=
- [Qemu-devel] [PULL v2 06/50] ivshmem: factor out the incoming fifo handling, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 08/50] ivshmem: remove superflous ivshmem_attr field, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 09/50] ivshmem: remove useless doorbell field, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 10/50] ivshmem: more qdev conversion, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 11/50] ivshmem: remove last exit(1), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 12/50] ivshmem: limit maximum number of peers to G_MAXUINT16, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 13/50] ivshmem: simplify around increase_dynamic_storage(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 14/50] ivshmem: allocate eventfds in resize_peers(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 16/50] ivshmem: initialize max_peer to -1, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 17/50] ivshmem: remove max_peer field, marcandre . lureau, 2015/10/12