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

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

Merge "ashmem: Allow for restricting mapping permissions multiple times" into... 

Merge "ashmem: Allow for restricting mapping permissions multiple times" into main am: 20f62340 am: 57c9d3b1

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



Change-Id: I52458da91e5200e37bd8e4c2b3bf497cc6b74fac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c56279e5 57c9d3b1

libcutils/ashmem-dev.cpp

+2 −2
Original line number Diff line number Diff line
@@ -390,8 +390,8 @@ static int memfd_set_prot_region(int fd, int prot) { 
    }



    /* We would only allow read-only for any future file operations */

    if (fcntl(fd, F_ADD_SEALS, F_SEAL_FUTURE_WRITE | F_SEAL_SEAL) == -1) {

        ALOGE("memfd_set_prot_region(%d, %d): F_SEAL_FUTURE_WRITE | F_SEAL_SEAL seal failed: %s\n",

    if (fcntl(fd, F_ADD_SEALS, F_SEAL_FUTURE_WRITE) == -1) {

        ALOGE("memfd_set_prot_region(%d, %d): F_SEAL_FUTURE_WRITE seal failed: %s\n",

              fd, prot, strerror(errno));

        return -1;

    }