diff options
| author | Peter Maydell | 2020-11-03 15:26:36 +0100 |
|---|---|---|
| committer | Laurent Vivier | 2020-11-04 22:25:20 +0100 |
| commit | 36d2dbc72df682df49c94a7a55f1e483f4f029a2 (patch) | |
| tree | b54fff7a403699bd74b31a071210c2e6d69765a4 | |
| parent | linux-user/mips/cpu_loop: silence the compiler warnings (diff) | |
| download | qemu-36d2dbc72df682df49c94a7a55f1e483f4f029a2.tar.gz qemu-36d2dbc72df682df49c94a7a55f1e483f4f029a2.tar.xz qemu-36d2dbc72df682df49c94a7a55f1e483f4f029a2.zip | |
linux-user: Use "!= 0" when checking if MAP_FIXED_NOREPLACE is non-zero
In pgd_find_hole_fallback(), Coverity doesn't like the use
of "if (MAP_FIXED_NOREPLACE || ...)" because it's using a
logical operator on a constant other than 0 or 1 and its
heuristic thinks we might have intended a bitwise operator
instead.
The logic is correct (we are checking whether the host really
has a MAP_FIXED_NOREPLACE or whether we fell back to the
"#define as 0 to ignore" from osdep.h); make Coverity
happier by explicitly writing out the comparison with zero.
Fixes: Coverity CID 1431059
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201103142636.21125-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | linux-user/elfload.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index bf8c1bd253..cae41d504d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2188,7 +2188,8 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t brk, PROT_NONE, flags, -1, 0); if (mmap_start != MAP_FAILED) { munmap((void *) align_start, guest_size); - if (MAP_FIXED_NOREPLACE || mmap_start == (void *) align_start) { + if (MAP_FIXED_NOREPLACE != 0 || + mmap_start == (void *) align_start) { return (uintptr_t) mmap_start + offset; } } |