diff mbox

[PULL,12/26] linux-user: Fix error handling in flatload.c target_pread()

Message ID e5a869ed569a97fa676e9827952629086ec41f4e.1474546244.git.riku.voipio@linaro.org
State Accepted
Commit e5a869ed569a97fa676e9827952629086ec41f4e
Headers show

Commit Message

Riku Voipio Sept. 22, 2016, 12:13 p.m. UTC 
From: Peter Maydell <peter.maydell@linaro.org>


The flatload.c target_pread() function is supposed to return
0 on success or negative host errnos; however it wasn't
checking lock_user() for failure or returning the errno from
the pread() call. Fix these problems (the first of which is
noted by Coverity).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>

---
 linux-user/flatload.c | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
2.1.4
diff mbox

Patch

diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index 42d1079..a35a560 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -95,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;
 }