DebugFS : more file/directory creation error handling
Correct dentry count to handle creation errors. This patch puts a dput at the file creation instead of the file removal : lookup_one_len already returns a dentry with reference count of 1. Then, the dget() in simple_mknod increments it when the dentry is associated with a file. In a scenario where simple_create or simple_mkdir returns an error, this would lead to an unwanted increment of the reference counter, therefore making file removal impossible. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
63223a0654
commit
65c333367b
|
@ -162,6 +162,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode,
|
||||||
error = debugfs_mkdir(parent->d_inode, *dentry, mode);
|
error = debugfs_mkdir(parent->d_inode, *dentry, mode);
|
||||||
else
|
else
|
||||||
error = debugfs_create(parent->d_inode, *dentry, mode);
|
error = debugfs_create(parent->d_inode, *dentry, mode);
|
||||||
|
dput(*dentry);
|
||||||
} else
|
} else
|
||||||
error = PTR_ERR(*dentry);
|
error = PTR_ERR(*dentry);
|
||||||
mutex_unlock(&parent->d_inode->i_mutex);
|
mutex_unlock(&parent->d_inode->i_mutex);
|
||||||
|
@ -273,6 +274,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);
|
||||||
void debugfs_remove(struct dentry *dentry)
|
void debugfs_remove(struct dentry *dentry)
|
||||||
{
|
{
|
||||||
struct dentry *parent;
|
struct dentry *parent;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
if (!dentry)
|
if (!dentry)
|
||||||
return;
|
return;
|
||||||
|
@ -284,11 +286,15 @@ void debugfs_remove(struct dentry *dentry)
|
||||||
mutex_lock(&parent->d_inode->i_mutex);
|
mutex_lock(&parent->d_inode->i_mutex);
|
||||||
if (debugfs_positive(dentry)) {
|
if (debugfs_positive(dentry)) {
|
||||||
if (dentry->d_inode) {
|
if (dentry->d_inode) {
|
||||||
if (S_ISDIR(dentry->d_inode->i_mode))
|
if (S_ISDIR(dentry->d_inode->i_mode)) {
|
||||||
simple_rmdir(parent->d_inode, dentry);
|
ret = simple_rmdir(parent->d_inode, dentry);
|
||||||
else
|
if (ret)
|
||||||
|
printk(KERN_ERR
|
||||||
|
"DebugFS rmdir on %s failed : "
|
||||||
|
"directory not empty.\n",
|
||||||
|
dentry->d_name.name);
|
||||||
|
} else
|
||||||
simple_unlink(parent->d_inode, dentry);
|
simple_unlink(parent->d_inode, dentry);
|
||||||
dput(dentry);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mutex_unlock(&parent->d_inode->i_mutex);
|
mutex_unlock(&parent->d_inode->i_mutex);
|
||||||
|
|
Loading…
Reference in a new issue