https://gcc.gnu.org/g:cd8e2137462d9ae1723fa193b6062ec65d164457
commit r13-8634-gcd8e2137462d9ae1723fa193b6062ec65d164457
Author: Jakub Jelinek <ja...@redhat.com>
Date: Wed Apr 17 10:24:18 2024 +0200
asan: Don't instrument .ABNORMAL_DISPATCHER [PR114743]
.ABNORMAL_DISPATCHER is currently the only internal function with
ECF_NORETURN, and asan likes to instrument ECF_NORETURN calls by adding
some builtin call before them, which breaks the .ABNORMAL_DISPATCHER
discovery added in gsi_safe_*.
The following patch fixes asan not to instrument .ABNORMAL_DISPATCHER
calls, like it doesn't instrument a couple of specific builtin calls
as well.
2024-04-17 Jakub Jelinek <ja...@redhat.com>
PR sanitizer/114743
* asan.cc (maybe_instrument_call): Don't instrument calls to
.ABNORMAL_DISPATCHER.
* gcc.dg/asan/pr112709-2.c (freddy): New function from
gcc.dg/ubsan/pr112709-2.c version of the test.
(cherry picked from commit 299d14a54672a4d12c1abbe4031a732bb56cddaa)
Diff:
---
gcc/asan.cc | 3 +++
gcc/testsuite/gcc.dg/asan/pr112709-2.c | 12 ++++++++++++
2 files changed, 15 insertions(+)
diff --git a/gcc/asan.cc b/gcc/asan.cc
index a917aa24ed8..55ce68f9777 100644
--- a/gcc/asan.cc
+++ b/gcc/asan.cc
@@ -3025,6 +3025,9 @@ maybe_instrument_call (gimple_stmt_iterator *iter)
break;
}
}
+ if (gimple_call_internal_p (stmt, IFN_ABNORMAL_DISPATCHER))
+ /* Don't instrument this. */
+ return false;
/* If a function does not return, then we must handle clearing up the
shadow stack accordingly. For ASAN we can simply set the entire stack
to "valid" for accesses by setting the shadow space to 0 and all
diff --git a/gcc/testsuite/gcc.dg/asan/pr112709-2.c
b/gcc/testsuite/gcc.dg/asan/pr112709-2.c
index e793f53507f..6fa3491c7eb 100644
--- a/gcc/testsuite/gcc.dg/asan/pr112709-2.c
+++ b/gcc/testsuite/gcc.dg/asan/pr112709-2.c
@@ -48,3 +48,15 @@ l3:
if (x < 4)
goto *q[x & 3];
}
+
+void
+freddy (int x, int *y, struct S *p)
+{
+ bar (*p);
+ ++p;
+ if (x == 25)
+ x = foo (2);
+ else if (x == 42)
+ x = foo (foo (3));
+ *y = bar (*p);
+}
