[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/40] linux-user: Use guest_range_valid in access_ok
From: |
Peter Maydell |
Subject: |
[PULL 14/40] linux-user: Use guest_range_valid in access_ok |
Date: |
Tue, 16 Feb 2021 16:16:32 +0000 |
From: Richard Henderson <richard.henderson@linaro.org>
We're currently open-coding the range check in access_ok;
use guest_range_valid when size != 0.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210212184902.1251044-15-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
linux-user/qemu.h | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 9fbc5edc4bd..ba122a79039 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -493,12 +493,9 @@ extern unsigned long guest_stack_size;
static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
{
- if (!guest_addr_valid(addr)) {
- return false;
- }
- if (size != 0 &&
- (addr + size - 1 < addr ||
- !guest_addr_valid(addr + size - 1))) {
+ if (size == 0
+ ? !guest_addr_valid(addr)
+ : !guest_range_valid(addr, size)) {
return false;
}
return page_check_range((target_ulong)addr, size, type) == 0;
--
2.20.1
- [PULL 02/40] linux-user: Introduce PAGE_ANON, (continued)
- [PULL 02/40] linux-user: Introduce PAGE_ANON, Peter Maydell, 2021/02/16
- [PULL 08/40] bsd-user: Tidy VERIFY_READ/VERIFY_WRITE, Peter Maydell, 2021/02/16
- [PULL 09/40] linux-user: Do not use guest_addr_valid for h2g_valid, Peter Maydell, 2021/02/16
- [PULL 05/40] exec: Improve types for guest_addr_valid, Peter Maydell, 2021/02/16
- [PULL 06/40] linux-user: Check for overflow in access_ok, Peter Maydell, 2021/02/16
- [PULL 10/40] linux-user: Fix guest_addr_valid vs reserved_va, Peter Maydell, 2021/02/16
- [PULL 07/40] linux-user: Tidy VERIFY_READ/VERIFY_WRITE, Peter Maydell, 2021/02/16
- [PULL 11/40] exec: Introduce cpu_untagged_addr, Peter Maydell, 2021/02/16
- [PULL 12/40] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged, Peter Maydell, 2021/02/16
- [PULL 13/40] linux-user: Explicitly untag memory management syscalls, Peter Maydell, 2021/02/16
- [PULL 14/40] linux-user: Use guest_range_valid in access_ok,
Peter Maydell <=
- [PULL 15/40] exec: Rename guest_{addr,range}_valid to *_untagged, Peter Maydell, 2021/02/16
- [PULL 16/40] linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged, Peter Maydell, 2021/02/16
- [PULL 17/40] linux-user: Move lock_user et al out of line, Peter Maydell, 2021/02/16
- [PULL 18/40] linux-user: Fix types in uaccess.c, Peter Maydell, 2021/02/16
- [PULL 19/40] linux-user: Handle tags in lock_user/unlock_user, Peter Maydell, 2021/02/16
- [PULL 20/40] linux-user/aarch64: Implement PR_TAGGED_ADDR_ENABLE, Peter Maydell, 2021/02/16
- [PULL 21/40] target/arm: Improve gen_top_byte_ignore, Peter Maydell, 2021/02/16
- [PULL 22/40] target/arm: Use the proper TBI settings for linux-user, Peter Maydell, 2021/02/16
- [PULL 24/40] linux-user/aarch64: Implement PROT_MTE, Peter Maydell, 2021/02/16