Merge "[HWASan] [16k] do not instrument getauxval" into main

This commit is contained in:
Florian Mayer 2024-06-11 15:16:52 +00:00 committed by Gerrit Code Review
commit eff0fada9d

View file

@ -37,7 +37,9 @@
// This function needs to be safe to call before TLS is set up, so it can't
// access errno or the stack protector.
__LIBC_HIDDEN__ unsigned long __bionic_getauxval(unsigned long type, bool* exists) {
// Cannot use HWASan, as this is called during setup of the HWASan runtime to
// determine the page size.
__LIBC_HIDDEN__ unsigned long __bionic_getauxval(unsigned long type, bool* exists) __attribute__((no_sanitize("hwaddress"))) {
for (ElfW(auxv_t)* v = __libc_shared_globals()->auxv; v->a_type != AT_NULL; ++v) {
if (v->a_type == type) {
*exists = true;
@ -48,7 +50,9 @@ __LIBC_HIDDEN__ unsigned long __bionic_getauxval(unsigned long type, bool* exist
return 0;
}
extern "C" unsigned long getauxval(unsigned long type) {
// Cannot use HWASan, as this is called during setup of the HWASan runtime to
// determine the page size.
extern "C" unsigned long getauxval(unsigned long type) __attribute__((no_sanitize("hwaddress"))) {
bool exists;
unsigned long result = __bionic_getauxval(type, &exists);
if (!exists) errno = ENOENT;