https://github.com/llvmbot updated https://github.com/llvm/llvm-project/pull/101728
>From 5ada0ed664693d637b86a3eb93dd0e4fb5b3d29c Mon Sep 17 00:00:00 2001 From: Fangrui Song <i...@maskray.me> Date: Fri, 2 Aug 2024 10:10:15 -0700 Subject: [PATCH] [asan,test] Disable _FORTIFY_SOURCE test incompatible with glibc 2.40 In terms of bug catching capability, `_FORTIFY_SOURCE` does not perform as well as some dynamic instrumentation tools. When a sanitizer is used, generally `_FORTIFY_SOURCE` should be disabled since sanitizer runtime does not implement most `*_chk` functions. Using `_FORTIFY_SOURCE` will regress error checking (asan/hwasan/tsan) or cause false positives (msan). `*printf_chk` are the most pronounced `_chk` interceptors for uninstrumented DSOes (https://reviews.llvm.org/D40951). glibc 2.40 introduced `pass_object_info` style fortified source for some functions ([1]). `fprintf` will be mangled as `_ZL7fprintfP8_IO_FILEU17pass_object_size1PKcz`, which has no associated interceptor, leading to printf-fortify-5.c failure. Just disable the test. Fix #100877 [1]: https://sourceware.org/pipermail/libc-alpha/2024-February/154531.html Pull Request: https://github.com/llvm/llvm-project/pull/101566 (cherry picked from commit bbdccf4c94ff18a0761b03a0e2c8b05805385132) --- .../test/asan/TestCases/Linux/printf-fortify-5.c | 3 ++- compiler-rt/test/lit.common.cfg.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c b/compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c index c7522e4029ea1..86cf4ab0c9a22 100644 --- a/compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c +++ b/compiler-rt/test/asan/TestCases/Linux/printf-fortify-5.c @@ -1,7 +1,8 @@ // RUN: %clang -fPIC -shared -O2 -D_FORTIFY_SOURCE=2 -D_DSO %s -o %t.so // RUN: %clang_asan -o %t %t.so %s // RUN: not %run %t 2>&1 | FileCheck %s -// REQUIRES: glibc-2.27 +/// Incompatible with pass_object_info style fortified source since glibc 2.40. +// REQUIRES: glibc-2.27 && !glibc-2.40 #ifdef _DSO #include <stdio.h> #include <stdlib.h> diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index 70bf43e2fac59..0690c3a18efdb 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -674,7 +674,16 @@ def add_glibc_versions(ver_string): ver = LooseVersion(ver_string) any_glibc = False - for required in ["2.19", "2.27", "2.30", "2.33", "2.34", "2.37", "2.38"]: + for required in [ + "2.19", + "2.27", + "2.30", + "2.33", + "2.34", + "2.37", + "2.38", + "2.40", + ]: if ver >= LooseVersion(required): config.available_features.add("glibc-" + required) any_glibc = True _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
