summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2016-09-29 17:20:27 +0200
committerRichard Weinberger <richard@nod.at>2016-12-12 23:07:38 +0100
commitba40e6a3c40514f6cd50df50033107c1c6794c20 (patch)
treeb1567d271bb4bdab197c2b47c7fee78e81eb80a6 /fs/ubifs
parent43b113fea2d427e17e7663494fc70c4e93e83d5e (diff)
downloadlinux-stable-ba40e6a3c40514f6cd50df50033107c1c6794c20.tar.gz
linux-stable-ba40e6a3c40514f6cd50df50033107c1c6794c20.tar.bz2
linux-stable-ba40e6a3c40514f6cd50df50033107c1c6794c20.zip
ubifs: Implement directory open operation
We need the ->open() hook to load the crypto context which is needed for all crypto operations within that directory. Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/dir.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 2315cb864c39..477817567971 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -1410,6 +1410,14 @@ int ubifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
return 0;
}
+static int ubifs_dir_open(struct inode *dir, struct file *file)
+{
+ if (ubifs_crypt_is_encrypted(dir))
+ return fscrypt_get_encryption_info(dir) ? -EACCES : 0;
+
+ return 0;
+}
+
const struct inode_operations ubifs_dir_inode_operations = {
.lookup = ubifs_lookup,
.create = ubifs_create,
@@ -1436,6 +1444,7 @@ const struct file_operations ubifs_dir_operations = {
.iterate_shared = ubifs_readdir,
.fsync = ubifs_fsync,
.unlocked_ioctl = ubifs_ioctl,
+ .open = ubifs_dir_open,
#ifdef CONFIG_COMPAT
.compat_ioctl = ubifs_compat_ioctl,
#endif