Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50bed420 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "riscv64: minor ASLR bits changes." into main am: d741c232 am: 2d574743 am: a0124bab 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755787



Change-Id: I364e59bb0bd00e975014d90d217e9cf704a65858
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 139c4aaa a0124bab

init/security.cpp

+4 −4
Original line number Diff line number Diff line
@@ -117,10 +117,10 @@ Result<void> SetMmapRndBitsAction(const BuiltinArguments&) { 
        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)) {

    // TODO: sv48 and sv57 have both been added to the kernel, but the kernel

    // still doesn't support more than 24 bits.

    // https://github.com/google/android-riscv64/issues/1

    if (SetMmapRndBitsMin(24, 24, false)) {

        return {};

    }

#elif defined(__x86_64__)