path: root/lib
diff options
authorEric W. Biederman <ebiederm@xmission.com>2013-09-23 14:41:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-27 09:18:39 -0700
commit730d7d339884f20da28b59bf6f0a16af6400a113 (patch)
tree0a8ae816ed49effe01e8464a66df9d59df0434c0 /lib
parentd2212b4dce596fee83e5c523400bf084f4cc816c (diff)
sysfs: Allow mounting without CONFIG_NET
In kobj_ns_current_may_mount the default should be to allow the mount. The test is only for a single kobj_ns_type at a time, and unless there is a reason to prevent it the mounting sysfs should be allowed. Subsystems that are not registered can't have are not involved so can't have a reason to prevent mounting sysfs. This is a bug-fix to commit 7dc5dbc879bd ("sysfs: Restrict mounting sysfs") that came in via the userns tree during the 3.12 merge window. Reported-and-tested-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 962175134702..669bf190d4fb 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -933,10 +933,7 @@ const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj)
bool kobj_ns_current_may_mount(enum kobj_ns_type type)
- bool may_mount = false;
- if (type == KOBJ_NS_TYPE_NONE)
- return true;
+ bool may_mount = true;
if ((type > KOBJ_NS_TYPE_NONE) && (type < KOBJ_NS_TYPES) &&