[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 09/25] ivshmem: fix incorrect error handling in ivs
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 09/25] ivshmem: fix incorrect error handling in ivshmem_recv_msg() |
Date: |
Mon, 31 Jul 2017 13:21:28 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
Screwed up in commit 3a55fc0f, v2.6.0.
If qemu_chr_fe_read_all() returns -EINTR the do {} statement continues and the
n accumulator used to complete reads upto sizeof(msg) is decremented by 4 (the
value of EINTR on Linux).
To avoid that, use simpler if() statements and continue if EINTR occured.
hw/misc/ivshmem.c:650:14: warning: Loss of sign in implicit conversion
} while (n < sizeof(msg));
^
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/misc/ivshmem.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index a58f9ee579..47a015f072 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -642,7 +642,10 @@ static int64_t ivshmem_recv_msg(IVShmemState *s, int *pfd,
Error **errp)
do {
ret = qemu_chr_fe_read_all(&s->server_chr, (uint8_t *)&msg + n,
sizeof(msg) - n);
- if (ret < 0 && ret != -EINTR) {
+ if (ret < 0) {
+ if (ret == -EINTR) {
+ continue;
+ }
error_setg_errno(errp, -ret, "read from server failed");
return INT64_MIN;
}
--
2.11.0
- [Qemu-trivial] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 06/25] qemu-system-tricore: segfault when entering "x 0" on the monitor, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 10/25] qcow2: fix null pointer dereference, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 09/25] ivshmem: fix incorrect error handling in ivshmem_recv_msg(),
Michael Tokarev <=
- [Qemu-trivial] [PULL 02/25] fix qemu-system-unicore32 crashing when calling without -kernel, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 07/25] tests: add missing dependency to build QTEST_QEMU_BINARY, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 04/25] tests: test-netfilter && pxe-test require slirp, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 12/25] net/eth: fix incorrect check of iov_to_buf() return value, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 13/25] m68k/translate: fix incorrect copy/paste, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 16/25] syscall: fix use of uninitialized values, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 19/25] docs: fix broken paths to docs/interop dir, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 08/25] loader: check get_image_size() return value, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 18/25] thunk: assert nb_fields is valid, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 17/25] syscall: check inotify() and eventfd() return value, Michael Tokarev, 2017/07/31