Merge branch 'akpm' (patches from Andrew)

[firefly-linux-kernel-4.4.55.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 68feb0f70e6358f83f5a5281bf3c64d16cad2015..361ab4ee42fc3632232f4bc6eaef54a12f6b47e6 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -134,6 +134,8 @@ static struct dentry *proc_mount(struct file_system_type *fs_type,
                }
 
                sb->s_flags |= MS_ACTIVE;
+               /* User space would break if executables appear on proc */
+               sb->s_iflags |= SB_I_NOEXEC;
        }
 
        return dget(sb->s_root);