diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-07-26 23:42:08 -0300 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2017-07-31 13:06:38 +0300 |
| commit | b7b1e9dd6d56612d4656817b11e43d9fbefdc497 (patch) | |
| tree | cc9ab18d6dc43054a04634c88826393c81ddbbff /hw/misc | |
| parent | 2a4e2e4919d1fcb915f1b33f9396aad5dc4616f5 (diff) | |
ivshmem: fix incorrect error handling in ivshmem_recv_msg()
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é <f4bug@amsat.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw/misc')
| -rw-r--r-- | hw/misc/ivshmem.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |