tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Treat static binaries "the same" for the profiling signals." am: 5b4913a599

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1840754

Change-Id: I6dece10d59d8560c8049f21d47195f0cdbfa5cbf
This commit is contained in:
Treehugger Robot 2021-09-30 16:57:36 +00:00 committed by Automerger Merge Worker
commit cb38a389dd
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/bionic/android_profiling_dynamic.cpp
View file

@ -68,8 +68,6 @@ __LIBC_HIDDEN__ void __libc_init_profiling_handlers() {
// does not get loaded for a) non-apps, b) non-profilable apps on user. The default signal
// disposition is to crash. We do not want the target to crash if we accidentally target a
// non-app or non-profilable process.
//
// This does *not* get run for processes that statically link libc, and those will still crash.
signal(BIONIC_SIGNAL_ART_PROFILER, SIG_IGN);
}

11
libc/bionic/libc_init_static.cpp
View file

@ -42,6 +42,7 @@
#include "platform/bionic/macros.h"
#include "platform/bionic/mte.h"
#include "platform/bionic/page.h"
#include "platform/bionic/reserved_signals.h"
#include "private/KernelArgumentBlock.h"
#include "private/bionic_asm.h"
#include "private/bionic_asm_note.h"
@ -331,6 +332,15 @@ __attribute__((no_sanitize("hwaddress", "memtag"))) void __libc_init_mte(const v
void __libc_init_mte(const void*, size_t, uintptr_t) {}
#endif // __aarch64__
void __libc_init_profiling_handlers() {
// The dynamic variant of this function is more interesting, but this
// at least ensures that static binaries aren't killed by the kernel's
// default disposition for these two real-time signals that would have
// handlers installed if this was a dynamic binary.
signal(BIONIC_SIGNAL_PROFILER, SIG_IGN);
signal(BIONIC_SIGNAL_ART_PROFILER, SIG_IGN);
}
__noreturn static void __real_libc_init(void *raw_args,
void (*onexit)(void) __unused,
int (*slingshot)(int, char**, char**),
@ -351,6 +361,7 @@ __noreturn static void __real_libc_init(void *raw_args,
__libc_init_mte(reinterpret_cast<ElfW(Phdr)*>(getauxval(AT_PHDR)), getauxval(AT_PHNUM),
/*load_bias = */ 0);
__libc_init_scudo();
__libc_init_profiling_handlers();
__libc_init_fork_handler();
call_ifunc_resolvers();