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

Commit d4ee7913 authored by Luis Hector Chavez's avatar Luis Hector Chavez Committed by android-build-merger
Browse files

Merge "fs_mgr: Always mount tmpfs with MS_NOEXEC" 

am: 8f2a34a8

Change-Id: I80ac903329f24756ef8a3d9bade11f446b2e1c31
parents 780d80b5 8f2a34a8

fs_mgr/fs_mgr.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1180,8 +1180,8 @@ int fs_mgr_do_tmpfs_mount(const char *n_name) 
{

    int ret;



    ret = mount("tmpfs", n_name, "tmpfs",

                MS_NOATIME | MS_NOSUID | MS_NODEV, CRYPTO_TMPFS_OPTIONS);

    ret = mount("tmpfs", n_name, "tmpfs", MS_NOATIME | MS_NOSUID | MS_NODEV | MS_NOEXEC,

                CRYPTO_TMPFS_OPTIONS);

    if (ret < 0) {

        LERROR << "Cannot mount tmpfs filesystem at " << n_name;

        return -1;