Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

[mirror_qemu.git] / linux-user / flatload.c

diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index f9139c399acebf0dea23576fd8a2c514f579686a..a35a560904917d086e52b97c8294e1d3e2d52e55 100644 (file)
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -34,11 +34,10 @@
 /****************************************************************************/
 
 #include "qemu/osdep.h"
-#include <sys/mman.h>
 
 #include "qemu.h"
 #include "flat.h"
-#include <target_flat.h>
+#include "target_flat.h"
 
 //#define DEBUG
 
@@ -96,7 +95,13 @@ static int target_pread(int fd, abi_ulong ptr, abi_ulong len,
     int ret;
 
     buf = lock_user(VERIFY_WRITE, ptr, len, 0);
+    if (!buf) {
+        return -EFAULT;
+    }
     ret = pread(fd, buf, len, offset);
+    if (ret < 0) {
+        ret = -errno;
+    }
     unlock_user(buf, ptr, len);
     return ret;
 }