projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[linux-2.6-microblaze.git]
/
fs
/
sysfs
/
mount.c
diff --git
a/fs/sysfs/mount.c
b/fs/sysfs/mount.c
index
1c6ac6f
..
f3db820
100644
(file)
--- 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;
}