[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/4] linux-user: Use "!= 0" when checking if MAP_FIXED_NOREPLACE i
From: |
Laurent Vivier |
Subject: |
[PULL 2/4] linux-user: Use "!= 0" when checking if MAP_FIXED_NOREPLACE is non-zero |
Date: |
Thu, 5 Nov 2020 08:08:35 +0100 |
From: Peter Maydell <peter.maydell@linaro.org>
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>
---
linux-user/elfload.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index bf8c1bd25330..cae41d504d36 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;
}
}
--
2.28.0
- [PULL 0/4] Linux user for 5.2 patches, Laurent Vivier, 2020/11/05
- [PULL 2/4] linux-user: Use "!= 0" when checking if MAP_FIXED_NOREPLACE is non-zero,
Laurent Vivier <=
- [PULL 4/4] linux-user: Check copy_from_user() return value in vma_dump_size(), Laurent Vivier, 2020/11/05
- [PULL 3/4] linux-user/syscall: Fix missing target_to_host_timespec64() check, Laurent Vivier, 2020/11/05
- [PULL 1/4] linux-user/mips/cpu_loop: silence the compiler warnings, Laurent Vivier, 2020/11/05
- Re: [PULL 0/4] Linux user for 5.2 patches, no-reply, 2020/11/05
- Re: [PULL 0/4] Linux user for 5.2 patches, Peter Maydell, 2020/11/06