iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

securityfs: ->d_parent is never NULL or negative

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2016-05-29 14:54:04 -04:00
parent 07a8e62fde
commit 4093d306a9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/inode.c
View File

@ -186,20 +186,21 @@ EXPORT_SYMBOL_GPL(securityfs_create_dir);
*/ */
void securityfs_remove(struct dentry *dentry) void securityfs_remove(struct dentry *dentry)
{ {
struct dentry *parent; struct inode *dir;
if (!dentry || IS_ERR(dentry)) if (!dentry || IS_ERR(dentry))
return; return;
inode_lock(d_inode(parent)); dir = d_inode(dentry->d_parent);
inode_lock(dir);
if (simple_positive(dentry)) { if (simple_positive(dentry)) {
if (d_is_dir(dentry)) if (d_is_dir(dentry))
simple_rmdir(d_inode(parent), dentry); simple_rmdir(dir, dentry);
else else
simple_unlink(d_inode(parent), dentry); simple_unlink(dir, dentry);
dput(dentry); dput(dentry);
} }
inode_unlock(d_inode(parent)); inode_unlock(dir);
simple_release_fs(&mount, &mount_count); simple_release_fs(&mount, &mount_count);
} }
EXPORT_SYMBOL_GPL(securityfs_remove); EXPORT_SYMBOL_GPL(securityfs_remove);