Skip to content

[compiler-rt] Fixed Android 8.1 getauxval(AT_PAGESZ) crashes if called from .preinit_array. (#113427) #116121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 6, 2025
Merged

[compiler-rt] Fixed Android 8.1 getauxval(AT_PAGESZ) crashes if called from .preinit_array. (#113427) #116121

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ca5e08
[compiler-rt] Fixed Android 8.1 `getauxval(AT_PAGESZ)` crashes if cal…
funsafe-ptr Nov 13, 2024
b1af624
[compiler-rt] Add Android page size comment and formatting.
funsafe-ptr Nov 23, 2024
8997cc5
[compiler-rt] Fix formatting.
funsafe-ptr Nov 23, 2024
b17a047
[compiler-rt] Fix comment.
funsafe-ptr Nov 23, 2024
08d3387
[compiler-rt] Add comment.
funsafe-ptr Nov 30, 2024
771698b
[compiler-rt] Use `getpagesize` for Android.
funsafe-ptr Dec 13, 2024
1837ce1
Revert "[compiler-rt] Use `getpagesize` for Android."
funsafe-ptr Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@
# include <sys/personality.h>
# endif

# if SANITIZER_ANDROID && __ANDROID_API__ < 35
// The weak `strerrorname_np` (introduced in API level 35) definition,
// allows for checking the API level at runtime.
extern "C" SANITIZER_WEAK_ATTRIBUTE const char *strerrorname_np(int);
# endif

# if SANITIZER_LINUX && defined(__loongarch__)
# include <sys/sysmacros.h>
# endif
Expand Down Expand Up @@ -1219,17 +1213,11 @@ uptr GetPageSize() {
int rv = internal_sysctl(mib, 2, &pz, &pzl, nullptr, 0);
CHECK_EQ(rv, 0);
return (uptr)pz;
# elif SANITIZER_ANDROID
// Using `getpagesize` because calling `getauxval` or `sysconf` from the
// `.preinit_array` can cause crashes on some older API levels.
return getpagesize();
# elif SANITIZER_USE_GETAUXVAL
# if SANITIZER_ANDROID && __ANDROID_API__ < 35
// The 16 KB page size was introduced in Android 15 (API level 35), while
// earlier versions of Android always used a 4 KB page size.
// We are checking the weak definition of `strerrorname_np` (introduced in API
// level 35) because some earlier API levels crashed when
// `getauxval(AT_PAGESZ)` was called from the `.preinit_array`.
if (!strerrorname_np)
return 4096;
# endif

return getauxval(AT_PAGESZ);
# else
return sysconf(_SC_PAGESIZE); // EXEC_PAGESIZE may not be trustworthy.
Expand Down
Loading