]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
bsd-user/mmap.c: check pread's return value to fix warnings with _FORTIFY_SOURCE
authorMikaël Urankar <mikael.urankar@gmail.com>
Thu, 16 Sep 2021 23:45:05 +0000 (17:45 -0600)
committerWarner Losh <imp@bsdimp.com>
Sun, 17 Oct 2021 22:55:52 +0000 (16:55 -0600)
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>
bsd-user/mmap.c

index fc3c1480f59c46c04e3b8eb2db68fc86b5b08ea8..4f4fa3ab462d17f0f5be5fd4603ce8222e7ef655 100644 (file)
@@ -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) {