Commit 846b2696 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Greg Kroah-Hartman

ext4: use file_dentry()

commit c0a37d48 upstream.

EXT4 may be used as lower layer of overlayfs and accessing f_path.dentry
can lead to a crash.

Fix by replacing direct access of file->f_path.dentry with the
file_dentry() accessor, which will always return a native object.
Reported-by: default avatarDaniel Axtens <dja@axtens.net>
Fixes: 4bacc9c9 ("overlayfs: Make f_path always point to the overlay and f_inode to the underlay")
Fixes: ff978b09 ("ext4 crypto: move context consistency check to ext4_file_open()")
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: David Howells <dhowells@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7222d930
......@@ -380,7 +380,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
return -ENOKEY;
}
dir = dget_parent(filp->f_path.dentry);
dir = dget_parent(file_dentry(filp));
if (ext4_encrypted_inode(d_inode(dir)) &&
!ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) {
ext4_warning(inode->i_sb,
......
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