Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0a37d48 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Theodore Ts'o
Browse files

ext4: use file_dentry() 



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>
Cc: <stable@vger.kernel.org> # v4.5
parent 9dd78d8c

fs/ext4/file.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,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,