[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 09/23] bsd-user/mmap.c: assert that target_mprotect cannot fail
From: |
Warner Losh |
Subject: |
[PULL v2 09/23] bsd-user/mmap.c: assert that target_mprotect cannot fail |
Date: |
Mon, 18 Oct 2021 13:01:01 -0600 |
Similar to the equivalent linux-user change 86abac06c14. All error
conditions that target_mprotect checks are also checked by target_mmap.
EACCESS cannot happen because we are just removing PROT_WRITE. ENOMEM
should not happen because we are modifying a whole VMA (and we have
bigger problems anyway if it happens).
Fixes a Coverity false positive, where Coverity complains about
target_mprotect's return value being passed to tb_invalidate_phys_range.
Signed-off-by: Mikaël Urankar <mikael.urankar@gmail.com>
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Kyle Evans <kevans@FreeBSD.org>
---
bsd-user/mmap.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 5b6ed5eed1..13cb32dba1 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -604,10 +604,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int
prot,
}
if (!(prot & PROT_WRITE)) {
ret = target_mprotect(start, len, prot);
- if (ret != 0) {
- start = ret;
- goto the_end;
- }
+ assert(ret == 0);
}
goto the_end;
}
--
2.32.0
- [PULL v2 00/23] Pull bsd user 20211018 patches, Warner Losh, 2021/10/18
- [PULL v2 01/23] bsd-user/mmap.c: Always zero MAP_ANONYMOUS memory in mmap_frag(), Warner Losh, 2021/10/18
- [PULL v2 03/23] bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs, Warner Losh, 2021/10/18
- [PULL v2 06/23] bsd-user/mmap.c: Convert to qemu_log logging for mmap debugging, Warner Losh, 2021/10/18
- [PULL v2 08/23] bsd-user/mmap.c: Implement MAP_EXCL, required by jemalloc in head, Warner Losh, 2021/10/18
- [PULL v2 09/23] bsd-user/mmap.c: assert that target_mprotect cannot fail,
Warner Losh <=
- [PULL v2 04/23] bsd-user/mmap.c: mmap return ENOMEM on overflow, Warner Losh, 2021/10/18
- [PULL v2 02/23] bsd-user/mmap.c: check pread's return value to fix warnings with _FORTIFY_SOURCE, Warner Losh, 2021/10/18
- [PULL v2 05/23] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD, Warner Losh, 2021/10/18
- [PULL v2 11/23] bsd-user/target_os-user.h: Remove support for FreeBSD older than 12.0, Warner Losh, 2021/10/18
- [PULL v2 10/23] meson: *-user: only descend into *-user when configured, Warner Losh, 2021/10/18
- [PULL v2 13/23] bsd-user: TARGET_RESET define is unused, remove it, Warner Losh, 2021/10/18
- [PULL v2 12/23] bsd-user/strace.list: Remove support for FreeBSD versions older than 12.0, Warner Losh, 2021/10/18
- [PULL v2 07/23] bsd-user/mmap.c: Don't mmap fd == -1 independently from MAP_ANON flag, Warner Losh, 2021/10/18
- [PULL v2 14/23] bsd-user: export get_errno and is_error from syscall.c, Warner Losh, 2021/10/18
- [PULL v2 17/23] bsd-user/target_os_elf.h: Remove fallback ELF_HWCAP and reorder, Warner Losh, 2021/10/18