diff options
| author | Mikaël Urankar | 2021-09-17 01:45:05 +0200 |
|---|---|---|
| committer | Warner Losh | 2021-10-18 00:55:52 +0200 |
| commit | 26778ac3da794f29c2c7c7d473f0a8d77b874392 (patch) | |
| tree | 7e3d6394b6afdda1cc007139be73823b403788a3 /bsd-user/mmap.c | |
| parent | bsd-user/mmap.c: Always zero MAP_ANONYMOUS memory in mmap_frag() (diff) | |
| download | qemu-26778ac3da794f29c2c7c7d473f0a8d77b874392.tar.gz qemu-26778ac3da794f29c2c7c7d473f0a8d77b874392.tar.xz qemu-26778ac3da794f29c2c7c7d473f0a8d77b874392.zip | |
bsd-user/mmap.c: check pread's return value to fix warnings with _FORTIFY_SOURCE
Simmilar to the equivalent linux-user: commit fb7e378cf9c, 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>
Diffstat (limited to 'bsd-user/mmap.c')
| -rw-r--r-- | bsd-user/mmap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index fc3c1480f5..4f4fa3ab46 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -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)) @@ -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) { |