diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-03-26 16:15:42 -0400 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-29 03:52:07 +0200 |
| commit | 1fe510ef4aa062dcc3b1e8fb88be701447d982ad (patch) | |
| tree | 8e70ededfed82e0678b3bbec90b871b6aefaebd0 | |
| parent | 497e4f5904374c294d60bb1112a08c08d4c9b72b (diff) | |
ext4 crypto: use dget_parent() in ext4_d_revalidate()
This avoids potential problems caused by a race where the inode gets
renamed out from its parent directory and the parent directory is
deleted while ext4_d_revalidate() is running.
Upstream commit: 3d43bcfef5f0548845a425365011c499875491b0
Fixes: 28b4c263961c
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Change-Id: Ia970597753fae0d67fa6eebb972de24d5c1194f8
| -rw-r--r-- | fs/ext4/crypto.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index 18b59eece..2b4929393 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -481,13 +481,16 @@ uint32_t ext4_validate_encryption_key_size(uint32_t mode, uint32_t size) */ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags) { - struct inode *dir = d_inode(dentry->d_parent); - struct ext4_crypt_info *ci = EXT4_I(dir)->i_crypt_info; + struct dentry *dir; + struct ext4_crypt_info *ci; int dir_has_key, cached_with_key; - if (!ext4_encrypted_inode(dir)) + dir = dget_parent(dentry); + if (!ext4_encrypted_inode(d_inode(dir))) { + dput(dir); return 0; - + } + ci = EXT4_I(d_inode(dir))->i_crypt_info; if (ci && ci->ci_keyring_key && (ci->ci_keyring_key->flags & ((1 << KEY_FLAG_INVALIDATED) | (1 << KEY_FLAG_REVOKED) | @@ -497,6 +500,7 @@ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags) /* this should eventually be an flag in d_flags */ cached_with_key = dentry->d_fsdata != NULL; dir_has_key = (ci != NULL); + dput(dir); /* * If the dentry was cached without the key, and it is a |