From a2684acfb61d40f441e240035d7f1ba50da637c8 Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Wed, 24 May 2023 16:30:31 -0700 Subject: [PATCH] [HWASan] use hwasan linker for Android 14+ This will allow to compile binaries that use hwasan to run on a non-HWASan system image. Reviewed By: pcc Differential Revision: https://reviews.llvm.org/D151388 --- clang/lib/Driver/ToolChains/Linux.cpp | 12 ++++++++++-- clang/test/Driver/linux-ld.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index 853ff99..920da6e 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -426,9 +426,17 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { const Distro Distro(getDriver().getVFS(), Triple); - if (Triple.isAndroid()) + if (Triple.isAndroid()) { + if (getSanitizerArgs(Args).needsHwasanRt() && + !Triple.isAndroidVersionLT(34) && Triple.isArch64Bit()) { + // On Android 14 and newer, there is a special linker_hwasan64 that + // allows to run HWASan binaries on non-HWASan system images. This + // is also available on HWASan system images, so we can just always + // use that instead. + return "/system/bin/linker_hwasan64"; + } return Triple.isArch64Bit() ? "/system/bin/linker64" : "/system/bin/linker"; - + } if (Triple.isMusl()) { std::string ArchName; bool IsArm = false; diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c index 287750a..d4e3bf9 100644 --- a/clang/test/Driver/linux-ld.c +++ b/clang/test/Driver/linux-ld.c @@ -1259,6 +1259,22 @@ // CHECK-ANDROID-32: "-dynamic-linker" "/system/bin/linker" // CHECK-ANDROID-64: "-dynamic-linker" "/system/bin/linker64" // +// Test that Android 14 and newer use linker_hwasan64 for hwasan builds +// RUN: %clang -### %s -no-pie 2>&1 \ +// RUN: -fsanitize=hwaddress \ +// RUN: --target=x86_64-linux-android33 \ +// RUN: --gcc-toolchain="" \ +// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +// RUN: | FileCheck --check-prefix=CHECK-ANDROID-OLD %s +// RUN: %clang -### %s -no-pie 2>&1 \ +// RUN: -fsanitize=hwaddress \ +// RUN: --target=x86_64-linux-android34 \ +// RUN: --gcc-toolchain="" \ +// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +// RUN: | FileCheck --check-prefix=CHECK-ANDROID-NEW %s +// CHECK-ANDROID-OLD: "-dynamic-linker" "/system/bin/linker64" +// CHECK-ANDROID-NEW: "-dynamic-linker" "/system/bin/linker_hwasan64" +// // Test that -pthread does not add -lpthread on Android. // RUN: %clang -### %s -no-pie 2>&1 \ // RUN: --target=arm-linux-androideabi -pthread \ -- 2.7.4