Make "ashmem" and "binder" ioctls be handled properly on 64-bit ARM Android,

rather than falling through to the generic handler and being mishandled.
Fixes #360574.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15923

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 9ace4fde7fa9f3574f388e9d18f3a5694e756e63..3523817ede79b7eca476b03c003e69625c8d392b 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -7082,7 +7082,8 @@ PRE(sys_ioctl)
       break;
 
 #  if defined(VGPV_arm_linux_android) || defined(VGPV_x86_linux_android) \
-      || defined(VGPV_mips32_linux_android)
+      || defined(VGPV_mips32_linux_android) \
+      || defined(VGPV_arm64_linux_android)
    /* ashmem */
    case VKI_ASHMEM_GET_SIZE:
    case VKI_ASHMEM_SET_SIZE:
@@ -9574,7 +9575,8 @@ POST(sys_ioctl)
       break;
 
 #  if defined(VGPV_arm_linux_android) || defined(VGPV_x86_linux_android) \
-      || defined(VGPV_mips32_linux_android)
+      || defined(VGPV_mips32_linux_android) \
+      || defined(VGPV_arm64_linux_android)
    /* ashmem */
    case VKI_ASHMEM_GET_SIZE:
    case VKI_ASHMEM_SET_SIZE:

diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
index 0df24ddc3c5ad9639b9804e668e2615dd6224c15..224c5ed0e99474aca3c21172399a2dd5468b7237 100644 (file)
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -3009,7 +3009,8 @@ struct vki_getcpu_cache {
 //----------------------------------------------------------------------
 
 #if defined(VGPV_arm_linux_android) || defined(VGPV_x86_linux_android) \
-    || defined(VGPV_mips32_linux_android)
+    || defined(VGPV_mips32_linux_android) \
+    || defined(VGPV_arm64_linux_android)
 
 #define VKI_ASHMEM_NAME_LEN 256