ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add mmap_rnd_bits routine for riscv64"

Browse source
This commit is contained in:
Treehugger Robot 2022-10-27 22:28:21 +00:00 • committed by Gerrit Code Review
commit 0eaca46f48
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init/security.cpp
View file

@ -116,6 +116,13 @@ Result<void> SetMmapRndBitsAction(const BuiltinArguments&) {
if (SetMmapRndBitsMin(33, 24, false) && (!Has32BitAbi() || SetMmapRndBitsMin(16, 16, true))) {
return {};
}
#elif defined(__riscv)
// TODO: sv48 and sv57 were both added to the kernel this year, so we
// probably just need some kernel fixes to enable higher ASLR randomization,
// but for now 24 is the maximum that the kernel supports.
if (SetMmapRndBitsMin(24, 18, false)) {
return {};
}
#elif defined(__x86_64__)
// x86_64 supports 28 - 32 rnd bits, but Android wants to ensure that the
// theoretical maximum of 32 bits is always supported and used.