From: Richard Weinberger <richard@nod.at>
Date: Thu, 29 Sep 2016 18:10:06 +0000 (+0200)
Subject: ubifs: Preload crypto context in ->lookup()
X-Git-Tag: v4.10-rc1~91^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9270b2f4cd9d903ed638c6cb93206baf458bdf46;p=thirdparty%2Fkernel%2Flinux.git

ubifs: Preload crypto context in ->lookup()

...and mark the dentry as encrypted.

Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index bd0af4e9ca0b1..9976a709b8755 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -218,6 +218,21 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,
 
 	dbg_gen("'%pd' in dir ino %lu", dentry, dir->i_ino);
 
+	if (ubifs_crypt_is_encrypted(dir)) {
+		err = fscrypt_get_encryption_info(dir);
+
+		/*
+		 * DCACHE_ENCRYPTED_WITH_KEY is set if the dentry is
+		 * created while the directory was encrypted and we
+		 * have access to the key.
+		 */
+		if (fscrypt_has_encryption_key(dir))
+			fscrypt_set_encrypted_dentry(dentry);
+		fscrypt_set_d_op(dentry);
+		if (err && err != -ENOKEY)
+			return ERR_PTR(err);
+	}
+
 	if (dentry->d_name.len > UBIFS_MAX_NLEN)
 		return ERR_PTR(-ENAMETOOLONG);