Commit 98a3331a authored by Franklin \"Snaipe\" Mathieu's avatar Franklin \"Snaipe\" Mathieu Committed by Laurent Vivier
Browse files

syscall: fixed mincore(2) not failing with ENOMEM 



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

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
memory.

Signed-off-by: default avatarFranklin "Snaipe" Mathieu <snaipe@diacritic.io>
Cc: Riku Voipio <riku.voipio@linaro.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <20170217085800.28873-2-snaipe@diacritic.io>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 59ebb6e4

linux-user/syscall.c

+8 −3
Original line number Diff line number Diff line
@@ -11194,11 +11194,16 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
    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);

            mincore_fail: