aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2016-03-26 16:14:41 -0400
committerTheodore Ts'o <tytso@mit.edu>2016-03-26 16:14:41 -0400
commit9dd78d8c9a7bd4bc341f5864db32d4331b8eae4c (patch)
tree2f70946530b1e90ab39560b206827e460c1444d5
parentbe62a1a8fd116f5cd9e53726601f970e16e17558 (diff)
ext4: use dget_parent() in ext4_file_open()
In f_op->open() lock on parent is not held, so there's no guarantee that parent dentry won't go away at any time. Even after this patch there's no guarantee that 'dir' will stay the parent of 'inode', but at least it won't be freed while being used. 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: <stable@vger.kernel.org> # v4.5
-rw-r--r--fs/ext4/file.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 6659e216385e..257118d4d078 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -329,7 +329,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
329 struct super_block *sb = inode->i_sb; 329 struct super_block *sb = inode->i_sb;
330 struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); 330 struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
331 struct vfsmount *mnt = filp->f_path.mnt; 331 struct vfsmount *mnt = filp->f_path.mnt;
332 struct inode *dir = filp->f_path.dentry->d_parent->d_inode; 332 struct dentry *dir;
333 struct path path; 333 struct path path;
334 char buf[64], *cp; 334 char buf[64], *cp;
335 int ret; 335 int ret;
@@ -373,14 +373,18 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
373 if (ext4_encryption_info(inode) == NULL) 373 if (ext4_encryption_info(inode) == NULL)
374 return -ENOKEY; 374 return -ENOKEY;
375 } 375 }
376 if (ext4_encrypted_inode(dir) && 376
377 !ext4_is_child_context_consistent_with_parent(dir, inode)) { 377 dir = dget_parent(filp->f_path.dentry);
378 if (ext4_encrypted_inode(d_inode(dir)) &&
379 !ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) {
378 ext4_warning(inode->i_sb, 380 ext4_warning(inode->i_sb,
379 "Inconsistent encryption contexts: %lu/%lu\n", 381 "Inconsistent encryption contexts: %lu/%lu\n",
380 (unsigned long) dir->i_ino, 382 (unsigned long) d_inode(dir)->i_ino,
381 (unsigned long) inode->i_ino); 383 (unsigned long) inode->i_ino);
384 dput(dir);
382 return -EPERM; 385 return -EPERM;
383 } 386 }
387 dput(dir);
384 /* 388 /*
385 * Set up the jbd2_inode if we are opening the inode for 389 * Set up the jbd2_inode if we are opening the inode for
386 * writing and the journal is present 390 * writing and the journal is present