[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PULL 14/14] syscall: fixed mincore(2) not failing with ENO

From: Michael Tokarev
Subject: [Qemu-devel] [PULL 14/14] syscall: fixed mincore(2) not failing with ENOMEM
Date: Tue, 28 Feb 2017 09:44:57 +0300

From: "Franklin \\\"Snaipe\\\" Mathieu" <address@hidden>

The current implementation of the mincore(2) syscall sets errno to
EFAULT when the region identified by the first two parameters is

This goes against the man page specification, where mincore(2) should
only fail with EFAULT when the third parameter is an invalid address;
and fail with ENOMEM when the checked region does not point to mapped

Signed-off-by: Franklin "Snaipe" Mathieu <address@hidden>
Cc: Riku Voipio <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
 linux-user/syscall.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index f569f82..6715ce3 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11063,11 +11063,16 @@ abi_long do_syscall(void *cpu_env, int num, abi_long 
     case TARGET_NR_mincore:
             void *a;
+            ret = -TARGET_ENOMEM;
+            a = lock_user(VERIFY_READ, arg1, arg2, 0);
+            if (!a) {
+                goto fail;
+            }
             ret = -TARGET_EFAULT;
-            if (!(a = lock_user(VERIFY_READ, arg1,arg2, 0)))
-                goto efault;
-            if (!(p = lock_user_string(arg3)))
+            p = lock_user_string(arg3);
+            if (!p) {
                 goto mincore_fail;
+            }
             ret = get_errno(mincore(a, arg2, p));
             unlock_user(p, arg3, ret);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]