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

Commit 4d4cb68f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "ashmem: Ensure all memfds have non-executable permissions by... 

Merge "Revert "ashmem: Ensure all memfds have non-executable permissions by default"" into main am: eba19fb8 am: 0c98986d

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



Change-Id: I78dc11084c6b0c9ab44ed5d9851571a4c4b49864
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97f94a34 0c98986d

libcutils/ashmem-dev.cpp

+2 −15
Original line number Diff line number Diff line
@@ -114,15 +114,8 @@ static bool __has_memfd_support() { 
    // Check if kernel support exists, otherwise fall back to ashmem.

    // This code needs to build on old API levels, so we can't use the libc

    // wrapper.

    //

    // MFD_NOEXEC_SEAL is used to match the semantics of the ashmem device,

    // which did not have executable permissions. This also seals the executable

    // permissions of the buffer (i.e. they cannot be changed by fchmod()).

    //

    // MFD_NOEXEC_SEAL implies MFD_ALLOW_SEALING.



    android::base::unique_fd fd(

            syscall(__NR_memfd_create, "test_android_memfd", MFD_CLOEXEC | MFD_NOEXEC_SEAL));

            syscall(__NR_memfd_create, "test_android_memfd", MFD_CLOEXEC | MFD_ALLOW_SEALING));

    if (fd == -1) {

        ALOGE("memfd_create failed: %m, no memfd support");

        return false;
@@ -290,13 +283,7 @@ int ashmem_valid(int fd) { 
static int memfd_create_region(const char* name, size_t size) {

    // This code needs to build on old API levels, so we can't use the libc

    // wrapper.

    //

    // MFD_NOEXEC_SEAL to match the semantics of the ashmem device, which did

    // not have executable permissions. This also seals the executable

    // permissions of the buffer (i.e. they cannot be changed by fchmod()).

    //

    // MFD_NOEXEC_SEAL implies MFD_ALLOW_SEALING.

    android::base::unique_fd fd(syscall(__NR_memfd_create, name, MFD_CLOEXEC | MFD_NOEXEC_SEAL));

    android::base::unique_fd fd(syscall(__NR_memfd_create, name, MFD_CLOEXEC | MFD_ALLOW_SEALING));



    if (fd == -1) {

        ALOGE("memfd_create(%s, %zd) failed: %m", name, size);