| Message ID | 20211008212344.95537-10-imp@bsdimp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bsd-user mmap fixes | expand |
On Fri, Oct 8, 2021 at 4:31 PM Warner Losh <imp@bsdimp.com> wrote: > > 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> > --- > 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 066d9c10ff..4586ad27d0 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 > > Reviewed-by: Kyle Evans <kevans@FreeBSD.org>
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 066d9c10ff..4586ad27d0 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; }