diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-06-23 17:53:46 +0200 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-10-24 18:02:48 +0200 |
commit | 951dada665041e8199e8c572d2981773fa2f0d8c (patch) | |
tree | 5a5daed31eac10ac8ab4f76258511a39c7d4214b /hw/misc | |
parent | b8ab854b27e9b88d9b85b4c572049b29cb96de43 (diff) |
ivshmem: fix number of bytes to push to fifo
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 <marcandre.lureau@redhat.com>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Diffstat (limited to 'hw/misc')
-rw-r--r-- | hw/misc/ivshmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index fb53b3ff33..2162d025a5 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; |