From 5746c1980a7000e123edd6837284dd5af3a12c9a Mon Sep 17 00:00:00 2001 From: Andrey Kazmin Date: Thu, 8 Jul 2021 13:59:25 +0300 Subject: [PATCH] Remove SIGTRAP from block list for HWASan build HWASan uses SIGTRAP to report an error. Do not block it. Change-Id: I5c89ae4930a3cb2edddbc3034d430356557cddba Signed-off-by: Andrey Kazmin --- packaging/rpm.spec | 4 ++++ rpmio/rpmsq.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/packaging/rpm.spec b/packaging/rpm.spec index 9bb1322..8a4b3c7 100644 --- a/packaging/rpm.spec +++ b/packaging/rpm.spec @@ -155,6 +155,10 @@ export LDFLAGS="${LDFLAGS} -pie -Wl,-Bsymbolic-functions -ffunction-sections" export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections" %endif +%{?hwasan_build: +export CPPFLAGS="$CPPFLAGS -DHWASAN_BUILD" +} + %reconfigure \ --disable-dependency-tracking \ --with-lua \ diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c index d157514..1bbdd0a 100644 --- a/rpmio/rpmsq.c +++ b/rpmio/rpmsq.c @@ -186,6 +186,9 @@ int rpmsqBlock(int op) sigdelset(&newMask, SIGILL); sigdelset(&newMask, SIGSEGV); sigdelset(&newMask, SIGTSTP); +#ifdef HWASAN_BUILD + sigdelset(&newMask, SIGTRAP); +#endif ret = pthread_sigmask(SIG_BLOCK, &newMask, &oldMask); } } else if (op == SIG_UNBLOCK) { -- 2.7.4