diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2016-03-26 16:14:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-20 15:45:24 +0900 |
commit | 846b2696a9ac0fd189714a1ca2ccfa5a38613439 (patch) | |
tree | 0575c49ab026ba55a53099e4d0a95a5e2b427e3b /fs | |
parent | 7222d93072f178e5e5c40a6b1fef8946f35bb4ee (diff) | |
download | linux-stable-846b2696a9ac0fd189714a1ca2ccfa5a38613439.tar.gz linux-stable-846b2696a9ac0fd189714a1ca2ccfa5a38613439.tar.bz2 linux-stable-846b2696a9ac0fd189714a1ca2ccfa5a38613439.zip |
ext4: use file_dentry()
commit c0a37d48788475d0a2cf4fbfaa28559a9de612fc 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: Daniel Axtens <dja@axtens.net>
Fixes: 4bacc9c9234c ("overlayfs: Make f_path always point to the overlay and f_inode to the underlay")
Fixes: ff978b09f973 ("ext4 crypto: move context consistency check to ext4_file_open()")
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: David Howells <dhowells@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index feb9ffc6f20d..38847f38b34a 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -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, |