commit 114556c533acdaf4c2cdada245890572985b2912
author Richard Henderson <richard.henderson@linaro.org> Fri Feb 12 10:48:45 2021 -0800
committer Peter Maydell <peter.maydell@linaro.org> Tue Feb 16 11:04:53 2021 +0000
tree 0befaaccf7e9d6f73a58186de0296e35b922f6ce
parent ee1bf83de79143e5893f19e1aa657d1c37ba0c70

linux-user: Use guest_range_valid in access_ok

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

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 9fbc5ed..ba122a7 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -493,12 +493,9 @@
 
 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;