From: Miklos Szeredi <miklos@szeredi.hu>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: dhowells@redhat.com, viro@zeniv.linux.org.uk,
Daniel Axtens <dja@axtens.net>, "Theodore Ts'o" <tytso@mit.edu>,
<stable@vger.kernel.org>
Subject: [PATCH 4/4] ext4: use file_dentry()
Date: Thu, 17 Mar 2016 10:02:03 +0100 [thread overview]
Message-ID: <1458205323-25685-4-git-send-email-miklos@szeredi.hu> (raw)
In-Reply-To: <1458205323-25685-1-git-send-email-miklos@szeredi.hu>
From: Miklos Szeredi <mszeredi@redhat.com>
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>
Cc: Theodore 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
---
fs/ext4/file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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,
--
2.1.4
next prev parent reply other threads:[~2016-03-17 9:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-17 9:02 [PATCH 1/4] vfs: add file_dentry() Miklos Szeredi
2016-03-17 9:02 ` [PATCH 2/4] nfs: use file_dentry() Miklos Szeredi
2016-03-17 9:02 ` [PATCH 3/4] ext4: use dget_parent() in ext4_file_open() Miklos Szeredi
2016-03-17 9:02 ` Miklos Szeredi [this message]
2016-03-17 9:09 ` [PATCH 1/4] vfs: add file_dentry() Sedat Dilek
2016-03-17 9:33 ` Miklos Szeredi
2016-03-17 10:15 ` Sedat Dilek
2016-03-17 10:19 ` Sedat Dilek
2016-03-17 14:18 ` Theodore Ts'o
2016-03-21 5:02 ` Theodore Ts'o
2016-03-21 5:22 ` Al Viro
2016-03-22 6:24 ` Daniel Axtens
2016-03-21 5:28 ` Al Viro
2016-03-21 8:16 ` Miklos Szeredi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458205323-25685-4-git-send-email-miklos@szeredi.hu \
--to=miklos@szeredi.hu \
--cc=dhowells@redhat.com \
--cc=dja@axtens.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.