BUG in sysfs_remove_group
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 6 lines · Nagendra Singh Tomar
The return value of
lookup_one_len()is used without testing for error return. This results in the following oops when SELinux is enabled and enforced. The reason for the Oops is as follows.
The shell's (bash) SELinux domain is not allowed "search" permission in sysfs
filesystem (typesysfs_tin the default SELinux policy), due to which thelookup_one_len->__lookup_hash->permission->security_inode_permission
Quoted 8 lines
returns
-EACCESS. This -ve number is passed as the 'dir' argument toremove_files()and then tosysfs_hash_and_remove()which accesses this bogus pointer resulting in the crash.
A simple fix will be to check forIS_ERR(dir)insysfs_remove_group()and
return (without doing anything) if true, but this will result in the corresponding sysfs dirent entries to be leaked. IMHO the proper fix will be to not check for "search" permissions in such cases where the internal kernel code is trying to free up sysfs entries like the current case.
I hit the same issue a couple of days before with MLS policy, and your report and analysis proved most useful, thanks.
A preliminary patch for this is below, based on suggestions from Stephen Smalley.
Please review, and Nagendra, let me know if this works for you.
Prevent permission checking from being peformed when the kernel wants to unconditionally remove a sysfs group, by introducing an kernel-only variant of lookup_one_len(), lookup_one_len_kern().
Additionally, as sysfs_remove_group() does not check the return value of the lookup before using it, a BUG_ON has been added to pinpoint the cause of any problems potentially caused by this (and as a form of annotation).
---
fs/namei.c | 29 +++++++++++++++++++++-------- fs/sysfs/group.c | 6 ++++-- include/linux/namei.h | 1 + 3 files changed, 26 insertions(+), 10 deletions(-)
fs/namei.c +21 -8
@@ -1248,17 +1248,20 @@ int __user_path_lookup_open(const char __user *name, unsigned int lookup_flags,* needs parent already locked. Doesn't follow mounts. * SMP-safe. */ -static struct dentry *__lookup_hash (struct qstr *name,struct dentry * base,struct nameidata *nd) +static struct dentry *__lookup_hash (struct qstr *name,struct dentry * base,struct nameidata *nd,int kern) {struct dentry * dentry;struct inode *inode;int err; inode = base->d_inode; - err =permission (inode,MAY_EXEC , nd); - dentry =ERR_PTR (err); -if (err) - goto out; + +if (likely (!kern)) { + err =permission (inode,MAY_EXEC , nd); + dentry =ERR_PTR (err); +if (err) + goto out; + }/* * See if the low-level filesystem might want
@@ -1289,11 +1292,11 @@ out:static struct dentry *lookup_hash (struct nameidata *nd) { -return __lookup_hash (&nd->last, nd->dentry, nd); +return __lookup_hash (&nd->last, nd->dentry, nd,0 ); }/* SMP-safe */ -struct dentry *lookup_one_len (const char * name,struct dentry * base,int len) +static inline struct dentry *__lookup_one_len (const char * name,struct dentry * base,int len,int kern) {unsigned long hash;struct qstr this;
@@ -1313,11 +1316,21 @@ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len) } this.hash =end_name_hash (hash); -return __lookup_hash (&this, base,NULL ); +return __lookup_hash (&this, base,NULL , kern); access:return ERR_PTR (-EACCES ); } +struct dentry *lookup_one_len (const char * name,struct dentry * base,int len) +{ +return __lookup_one_len (name, base, len,0 ); +} + +struct dentry *lookup_one_len_kern (const char * name,struct dentry * base,int len) +{ +return __lookup_one_len (name, base, len,1 ); +} +/* * namei() *
fs/sysfs/group.c +4 -2
@@ -70,9 +70,11 @@ void sysfs_remove_group(struct kobject * kobj, {struct dentry * dir; -if (grp->name) - dir =lookup_one_len (grp->name, kobj->dentry, +if (grp->name) { + dir =lookup_one_len_kern (grp->name, kobj->dentry,strlen (grp->name)); +BUG_ON (IS_ERR (dir)); + }else dir =dget (kobj->dentry);
include/linux/namei.h +1 -0
@@ -82,6 +82,7 @@ extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);extern void release_open_intent (struct nameidata *);extern struct dentry *lookup_one_len (const char *,struct dentry *,int ); +extern struct dentry *lookup_one_len_kern (const char *,struct dentry *,int );extern int follow_down (struct vfsmount **,struct dentry **);extern int follow_up (struct vfsmount **,struct dentry **);
Updated version of the patch, which splits __lookup_hash() into normal and kernel variants, to prevent a check of the type of lookup. Also splits lookup_one_len(). Tests ok on my system. Please review.
Subject: [PATCH] security: prevent permission checking of file removal via sysfs_remove_group()
Prevent permission checking from being peformed when the kernel wants to unconditionally remove a sysfs group, by introducing an kernel-only variant of lookup_one_len(), lookup_one_len_kern().
Additionally, as sysfs_remove_group() does not check the return value of the lookup before using it, a BUG_ON has been added to pinpoint the cause of any problems potentially caused by this (and as a form of annotation).
--- fs/namei.c | 72 +++++++++++++++++++++++++++++++++++------------- fs/sysfs/group.c | 6 +++- include/linux/namei.h | 1 + 3 files changed, 57 insertions(+), 22 deletions(-)
fs/namei.c +52 -20
@@ -1243,22 +1243,13 @@ int __user_path_lookup_open(const char __user *name, unsigned int lookup_flags,return err; } -/* -* Restricted form of lookup. Doesn't follow links, single-component only, -* needs parent already locked. Doesn't follow mounts. -* SMP-safe. -*/ -static struct dentry *__lookup_hash (struct qstr *name,struct dentry * base,struct nameidata *nd) +static inline struct dentry *__lookup_hash_kern (struct qstr *name,struct dentry *base,struct nameidata *nd) { -struct dentry * dentry; +struct dentry *dentry;struct inode *inode;int err; inode = base->d_inode; - err =permission (inode,MAY_EXEC , nd); - dentry =ERR_PTR (err); -if (err) - goto out;/* * See if the low-level filesystem might want
@@ -1287,35 +1278,76 @@ out:return dentry; } +/* +* Restricted form of lookup. Doesn't follow links, single-component only, +* needs parent already locked. Doesn't follow mounts. +* SMP-safe. +*/ +static inline struct dentry *__lookup_hash (struct qstr *name,struct dentry *base,struct nameidata *nd) +{ +struct dentry *dentry; +struct inode *inode; +int err; + + inode = base->d_inode; + + err =permission (inode,MAY_EXEC , nd); + dentry =ERR_PTR (err); +if (err) + goto out; + + dentry =__lookup_hash_kern (name, base, nd); +out: +return dentry; +} +static struct dentry *lookup_hash (struct nameidata *nd) {return __lookup_hash (&nd->last, nd->dentry, nd); }/* SMP-safe */ -struct dentry *lookup_one_len (const char * name,struct dentry * base,int len) +static inline int __lookup_one_len (const char *name,struct qstr *this,struct dentry *base,int len) {unsigned long hash; -struct qstr this;unsigned int c; - this.name = name; - this.len = len; + this->name = name; + this->len = len;if (!len) - goto access; +return -EACCES ; hash =init_name_hash ();while (len--) { c = *(const unsigned char *)name++;if (c =='/' || c =='\0' ) - goto access; +return -EACCES ; hash =partial_name_hash (c, hash); } - this.hash =end_name_hash (hash); + this->hash =end_name_hash (hash); +return 0 ; +} +struct dentry *lookup_one_len (const char *name,struct dentry *base,int len) +{ +int err; +struct qstr this; + + err =__lookup_one_len (name, &this, base, len); +if (err) +return ERR_PTR (err);return __lookup_hash (&this, base,NULL ); -access: -return ERR_PTR (-EACCES ); +} + +struct dentry *lookup_one_len_kern (const char *name,struct dentry *base,int len) +{ +int err; +struct qstr this; + + err =__lookup_one_len (name, &this, base, len); +if (err) +return ERR_PTR (err); +return __lookup_hash_kern (&this, base,NULL ); }/*
fs/sysfs/group.c +4 -2
@@ -70,9 +70,11 @@ void sysfs_remove_group(struct kobject * kobj, {struct dentry * dir; -if (grp->name) - dir =lookup_one_len (grp->name, kobj->dentry, +if (grp->name) { + dir =lookup_one_len_kern (grp->name, kobj->dentry,strlen (grp->name)); +BUG_ON (IS_ERR (dir)); + }else dir =dget (kobj->dentry);
include/linux/namei.h +1 -0
@@ -82,6 +82,7 @@ extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);extern void release_open_intent (struct nameidata *);extern struct dentry *lookup_one_len (const char *,struct dentry *,int ); +extern struct dentry *lookup_one_len_kern (const char *,struct dentry *,int );extern int follow_down (struct vfsmount **,struct dentry **);extern int follow_up (struct vfsmount **,struct dentry **);
Signature · 1 line
1.5.0.6