1 files changed, 4 insertions, 0 deletions

diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 1c6ac6fcee9f..f3db82071cfb 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -40,6 +40,10 @@ static struct dentry *sysfs_mount(struct file_system_type *fs_type,
                                 SYSFS_MAGIC, &new_sb, ns);
         if (IS_ERR(root) || !new_sb)
                 kobj_ns_drop(KOBJ_NS_TYPE_NET, ns);
+        else if (new_sb)
+                /* Userspace would break if executables appear on sysfs */
+                root->d_sb->s_iflags |= SB_I_NOEXEC;
+
         return root;
 }