OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util/ioc.c: try to reassure Coverity about qemu_iovec_init_extended

Browse Source 
Make it more obvious, that filling qiov corresponds to qiov allocation,
which in turn corresponds to total_niov calculation, based on mid_niov
(not mid_len). Still add an assertion to show that there should be no
difference.

[Added mingw "error: 'mid_iov' may be used uninitialized in this
function" compiler error fix suggested by Vladimir.
--Stefan]

Reported-by: Coverity (CID 1405302)
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190910090310.14032-1-vsementsov@virtuozzo.com
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20190910090310.14032-1-vsementsov@virtuozzo.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

fixup! util/ioc.c: try to reassure Coverity about qemu_iovec_init_extended
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-09-10 12:03:10 +03:00 committed by Stefan Hajnoczi
parent 560009f2c8
commit d38d6de2a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/iov.c
View File

@ -423,7 +423,7 @@ void qemu_iovec_init_extended(
{ {
size_t mid_head, mid_tail; size_t mid_head, mid_tail;
int total_niov, mid_niov = 0; int total_niov, mid_niov = 0;
struct iovec *p, *mid_iov; struct iovec *p, *mid_iov = NULL;
if (mid_len) { if (mid_len) {
mid_iov = qiov_slice(mid_qiov, mid_offset, mid_len, mid_iov = qiov_slice(mid_qiov, mid_offset, mid_len,
@ -446,7 +446,8 @@ void qemu_iovec_init_extended(
p++; p++;
} }
if (mid_len) { assert(!mid_niov == !mid_len);
if (mid_niov) {
memcpy(p, mid_iov, mid_niov * sizeof(*p)); memcpy(p, mid_iov, mid_niov * sizeof(*p));
p[0].iov_base = (uint8_t *)p[0].iov_base + mid_head; p[0].iov_base = (uint8_t *)p[0].iov_base + mid_head;
p[0].iov_len -= mid_head; p[0].iov_len -= mid_head;