Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[sfrench/cifs-2.6.git] / fs / ubifs / dir.c

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index b777bddaa1dda9f2768952dc562e06df6b068d32..8049851cac42ff50e3f1280e62b1845ab7a7720a 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -285,6 +285,15 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,
                goto out_dent;
        }
 
+       if (ubifs_crypt_is_encrypted(dir) &&
+           (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&
+           !fscrypt_has_permitted_context(dir, inode)) {
+               ubifs_warn(c, "Inconsistent encryption contexts: %lu/%lu",
+                          dir->i_ino, inode->i_ino);
+               err = -EPERM;
+               goto out_inode;
+       }
+
 done:
        kfree(dent);
        fscrypt_free_filename(&nm);
@@ -295,6 +304,8 @@ done:
        d_add(dentry, inode);
        return NULL;
 
+out_inode:
+       iput(inode);
 out_dent:
        kfree(dent);
 out_fname: