Commit 25d41d84 authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman

debugfs: Fix filesystem reference counting on debugfs_remove() failure

When __debugfs_remove() fails (because simple_rmdir() fails e.g. when a
directory is not empty), we must not decrement use count of the filesystem
as nothing was in fact deleted.

This fixes use after free caused by debugfs in some cases.
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b38360a2
...@@ -307,7 +307,7 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent, ...@@ -307,7 +307,7 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
} }
EXPORT_SYMBOL_GPL(debugfs_create_symlink); EXPORT_SYMBOL_GPL(debugfs_create_symlink);
static void __debugfs_remove(struct dentry *dentry, struct dentry *parent) static int __debugfs_remove(struct dentry *dentry, struct dentry *parent)
{ {
int ret = 0; int ret = 0;
...@@ -330,6 +330,7 @@ static void __debugfs_remove(struct dentry *dentry, struct dentry *parent) ...@@ -330,6 +330,7 @@ static void __debugfs_remove(struct dentry *dentry, struct dentry *parent)
dput(dentry); dput(dentry);
} }
} }
return ret;
} }
/** /**
...@@ -348,7 +349,8 @@ static void __debugfs_remove(struct dentry *dentry, struct dentry *parent) ...@@ -348,7 +349,8 @@ static void __debugfs_remove(struct dentry *dentry, struct dentry *parent)
void debugfs_remove(struct dentry *dentry) void debugfs_remove(struct dentry *dentry)
{ {
struct dentry *parent; struct dentry *parent;
int ret;
if (!dentry) if (!dentry)
return; return;
...@@ -357,9 +359,10 @@ void debugfs_remove(struct dentry *dentry) ...@@ -357,9 +359,10 @@ void debugfs_remove(struct dentry *dentry)
return; return;
mutex_lock(&parent->d_inode->i_mutex); mutex_lock(&parent->d_inode->i_mutex);
__debugfs_remove(dentry, parent); ret = __debugfs_remove(dentry, parent);
mutex_unlock(&parent->d_inode->i_mutex); mutex_unlock(&parent->d_inode->i_mutex);
simple_release_fs(&debugfs_mount, &debugfs_mount_count); if (!ret)
simple_release_fs(&debugfs_mount, &debugfs_mount_count);
} }
EXPORT_SYMBOL_GPL(debugfs_remove); EXPORT_SYMBOL_GPL(debugfs_remove);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment