From: Eric Biggers <ebiggers@google.com>
Date: Wed, 29 Nov 2017 20:43:14 +0000 (-0800)
Subject: ubifs: switch to fscrypt_prepare_link()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5653878c8ca417b2f7b283df0db0141bb3c185f7;p=linux.git

ubifs: switch to fscrypt_prepare_link()

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 417fe0b29f23e..09e6c56b11bce 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -743,9 +743,9 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
 	ubifs_assert(inode_is_locked(dir));
 	ubifs_assert(inode_is_locked(inode));
 
-	if (ubifs_crypt_is_encrypted(dir) &&
-	    !fscrypt_has_permitted_context(dir, inode))
-		return -EPERM;
+	err = fscrypt_prepare_link(old_dentry, dir, dentry);
+	if (err)
+		return err;
 
 	err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm);
 	if (err)