Skip to content

Commit

Permalink
bsd-user/mmap.c: check pread's return value to fix warnings with _FOR…
Browse files Browse the repository at this point in the history
…TIFY_SOURCE

Simmilar to the equivalent linux-user: commit fb7e378, which added
checking to pread's return value. Update to current qemu standards with
{} around the if statement.

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>
  • Loading branch information
Mikaël Urankar authored and bsdimp committed Oct 17, 2021
1 parent 948516a commit 26778ac
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions bsd-user/mmap.c
Expand Up @@ -174,7 +174,9 @@ static int mmap_frag(abi_ulong real_start,
mprotect(host_start, qemu_host_page_size, prot1 | PROT_WRITE);

/* read the corresponding file data */
pread(fd, g2h_untagged(start), end - start, offset);
if (pread(fd, g2h_untagged(start), end - start, offset) == -1) {
return -1;
}

/* put final protection */
if (prot_new != (prot1 | PROT_WRITE))
Expand Down Expand Up @@ -593,7 +595,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
-1, 0);
if (retaddr == -1)
goto fail;
pread(fd, g2h_untagged(start), len, offset);
if (pread(fd, g2h_untagged(start), len, offset) == -1) {
goto fail;
}
if (!(prot & PROT_WRITE)) {
ret = target_mprotect(start, len, prot);
if (ret != 0) {
Expand Down

0 comments on commit 26778ac

Please sign in to comment.