From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 77DA93858D20; Wed, 17 Apr 2024 08:24:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 77DA93858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1713342290; bh=OmZkmMPg/TlPWm+Jjo62Ew5uk1HCPlCQFuxk2tv8qa0=; h=From:To:Subject:Date:From; b=GsnOWjwaHuGLShpOnhw3dPDDbEpz7ZozvZ1Cwc9yeGWJGu10p/9xFt+dOyUkkOKEZ lnmx2Gad1aBXOdLo5LXD3H/csRxozD4FElYHkeHaa4ZBF8WXBTrRAENbyMt3/4MdZV HEX5B6hB5rb7wAAkCGSRrj/QS7fGwfGlWza1nnMw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-10000] asan: Don't instrument .ABNORMAL_DISPATCHER [PR114743] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 9c7cf5d71f071655a90a6d364369d111bafdb25a X-Git-Newrev: 299d14a54672a4d12c1abbe4031a732bb56cddaa Message-Id: <20240417082450.77DA93858D20@sourceware.org> Date: Wed, 17 Apr 2024 08:24:50 +0000 (GMT) List-Id: https://gcc.gnu.org/g:299d14a54672a4d12c1abbe4031a732bb56cddaa commit r14-10000-g299d14a54672a4d12c1abbe4031a732bb56cddaa Author: Jakub Jelinek 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 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. 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 57c3a9b00e1..9e0f51b1477 100644 --- a/gcc/asan.cc +++ b/gcc/asan.cc @@ -3030,6 +3030,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); +}