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

Commit 3e400024 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 am: d4ee7913 am: 39669e51 

am: 6b7c6798

Change-Id: Ice22ddee030ddfc14ed14fb55b494e01629d2baa
parents 320aca77 6b7c6798

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;