From 7c3b4bf540422cb5031ad0e452046c2b47877b57 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Thu, 4 Aug 2016 21:11:28 +0000 Subject: [PATCH] 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 --- coregrind/m_syswrap/syswrap-linux.c | 6 ++++-- include/vki/vki-linux.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c index 9ace4fde7f..3523817ede 100644 --- 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 0df24ddc3c..224c5ed0e9 100644 --- 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 -- 2.47.2