linux-user: Tidy VERIFY_READ/VERIFY_WRITE

These constants are only ever used with access_ok, and friends.
Rather than translating them to PAGE_* bits, let them equal
the PAGE_* bits to begin.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210212184902.1251044-8-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2021-02-12 10:48:38 -08:00 committed by Peter Maydell
parent 4feac83a9c
commit 68f7766664

View File

@ -488,8 +488,8 @@ extern unsigned long guest_stack_size;
/* user access */ /* user access */
#define VERIFY_READ 0 #define VERIFY_READ PAGE_READ
#define VERIFY_WRITE 1 /* implies read access */ #define VERIFY_WRITE (PAGE_READ | PAGE_WRITE)
static inline bool access_ok(int type, abi_ulong addr, abi_ulong size) static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
{ {
@ -501,9 +501,7 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
!guest_addr_valid(addr + size - 1))) { !guest_addr_valid(addr + size - 1))) {
return false; return false;
} }
return page_check_range((target_ulong)addr, size, return page_check_range((target_ulong)addr, size, type) == 0;
(type == VERIFY_READ) ? PAGE_READ :
(PAGE_READ | PAGE_WRITE)) == 0;
} }
/* NOTE __get_user and __put_user use host pointers and don't check access. /* NOTE __get_user and __put_user use host pointers and don't check access.