diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-23 11:27:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-15 08:10:11 +0100 |
| commit | c619140d4843e1e54b32fadadc79e0fba909f55d (patch) | |
| tree | 290fa60d9d512a46476a4840a249e2720e3fb428 | |
| parent | 0c548bab17c2ecd457a84c78ca53a10f389b316e (diff) | |
| download | linux-stable-c619140d4843e1e54b32fadadc79e0fba909f55d.tar.gz linux-stable-c619140d4843e1e54b32fadadc79e0fba909f55d.tar.bz2 linux-stable-c619140d4843e1e54b32fadadc79e0fba909f55d.zip | |
debugfs: fix debugfs_rename parameter checking
commit d88c93f090f708c18195553b352b9f205e65418f upstream.
debugfs_rename() needs to check that the dentries passed into it really
are valid, as sometimes they are not (i.e. if the return value of
another debugfs call is passed into this one.) So fix this up by
properly checking if the two parent directories are errors (they are
allowed to be NULL), and if the dentry to rename is not NULL or an
error.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/debugfs/inode.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 13b01351dd1c..41ef452c1fcf 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -787,6 +787,13 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, struct dentry *dentry = NULL, *trap; struct name_snapshot old_name; + if (IS_ERR(old_dir)) + return old_dir; + if (IS_ERR(new_dir)) + return new_dir; + if (IS_ERR_OR_NULL(old_dentry)) + return old_dentry; + trap = lock_rename(new_dir, old_dir); /* Source or destination directories don't exist? */ if (d_really_is_negative(old_dir) || d_really_is_negative(new_dir)) |