[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 07/31] linux-user: Tidy VERIFY_READ/VERIFY_WRITE
From: |
Richard Henderson |
Subject: |
[PATCH v5 07/31] linux-user: Tidy VERIFY_READ/VERIFY_WRITE |
Date: |
Wed, 3 Feb 2021 08:59:46 -1000 |
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>
---
linux-user/qemu.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 441ba6a78b..9251337daf 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -488,8 +488,8 @@ extern unsigned long guest_stack_size;
/* user access */
-#define VERIFY_READ 0
-#define VERIFY_WRITE 1 /* implies read access */
+#define VERIFY_READ PAGE_READ
+#define VERIFY_WRITE (PAGE_READ | PAGE_WRITE)
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))) {
return false;
}
- return page_check_range((target_ulong)addr, size,
- (type == VERIFY_READ) ? PAGE_READ :
- (PAGE_READ | PAGE_WRITE)) == 0;
+ return page_check_range((target_ulong)addr, size, type) == 0;
}
/* NOTE __get_user and __put_user use host pointers and don't check access.
--
2.25.1
- [PATCH v5 00/31] target-arm: Implement ARMv8.5-MemTag, user mode, Richard Henderson, 2021/02/03
- [PATCH v5 01/31] tcg: Introduce target-specific page data for user-only, Richard Henderson, 2021/02/03
- [PATCH v5 05/31] exec: Improve types for guest_addr_valid, Richard Henderson, 2021/02/03
- [PATCH v5 06/31] linux-user: Check for overflow in access_ok, Richard Henderson, 2021/02/03
- [PATCH v5 02/31] linux-user: Introduce PAGE_ANON, Richard Henderson, 2021/02/03
- [PATCH v5 07/31] linux-user: Tidy VERIFY_READ/VERIFY_WRITE,
Richard Henderson <=
- [PATCH v5 08/31] bsd-user: Tidy VERIFY_READ/VERIFY_WRITE, Richard Henderson, 2021/02/03
- [PATCH v5 10/31] linux-user: Fix guest_addr_valid vs reserved_va, Richard Henderson, 2021/02/03
- [PATCH v5 13/31] linux-user: Explicitly untag memory management syscalls, Richard Henderson, 2021/02/03
- [PATCH v5 03/31] exec: Use uintptr_t for guest_base, Richard Henderson, 2021/02/03
- [PATCH v5 12/31] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged, Richard Henderson, 2021/02/03