aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2016-04-11 18:10:11 -0400
committerJaegeuk Kim <jaegeuk@kernel.org>2016-04-12 13:24:04 -0400
commitd7d75352890447b55c13a81df316a6894ff32ecf (patch)
tree8204d591641df8bf7c63ddf464fb9f3e2ab40944
parentbf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff)
fscrypto: use dget_parent() in fscrypt_d_revalidate()
This patch updates fscrypto along with the below ext4 crypto change. Fixes: 3d43bcfef5f0 ("ext4 crypto: use dget_parent() in ext4_d_revalidate()") Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/crypto/crypto.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index 7f5804537d30..58ae0ba91ca2 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -345,13 +345,17 @@ EXPORT_SYMBOL(fscrypt_zeroout_range);
345 */ 345 */
346static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) 346static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
347{ 347{
348 struct inode *dir = d_inode(dentry->d_parent); 348 struct dentry *dir;
349 struct fscrypt_info *ci = dir->i_crypt_info; 349 struct fscrypt_info *ci;
350 int dir_has_key, cached_with_key; 350 int dir_has_key, cached_with_key;
351 351
352 if (!dir->i_sb->s_cop->is_encrypted(dir)) 352 dir = dget_parent(dentry);
353 if (!d_inode(dir)->i_sb->s_cop->is_encrypted(d_inode(dir))) {
354 dput(dir);
353 return 0; 355 return 0;
356 }
354 357
358 ci = d_inode(dir)->i_crypt_info;
355 if (ci && ci->ci_keyring_key && 359 if (ci && ci->ci_keyring_key &&
356 (ci->ci_keyring_key->flags & ((1 << KEY_FLAG_INVALIDATED) | 360 (ci->ci_keyring_key->flags & ((1 << KEY_FLAG_INVALIDATED) |
357 (1 << KEY_FLAG_REVOKED) | 361 (1 << KEY_FLAG_REVOKED) |
@@ -363,6 +367,7 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)
363 cached_with_key = dentry->d_flags & DCACHE_ENCRYPTED_WITH_KEY; 367 cached_with_key = dentry->d_flags & DCACHE_ENCRYPTED_WITH_KEY;
364 spin_unlock(&dentry->d_lock); 368 spin_unlock(&dentry->d_lock);
365 dir_has_key = (ci != NULL); 369 dir_has_key = (ci != NULL);
370 dput(dir);
366 371
367 /* 372 /*
368 * If the dentry was cached without the key, and it is a 373 * If the dentry was cached without the key, and it is a