From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 31 May 2015 17:34:57 +0000 (-0400)
Subject: ext4 crypto: make sure the encryption info is initialized on opendir(2)
X-Git-Tag: Ubuntu-5.10.0-12.13~14590^2~39
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6bc445e0ff44c7e83225124c214d350407e68ccf;p=mirror_ubuntu-hirsute-kernel.git

ext4 crypto: make sure the encryption info is initialized on opendir(2)

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index e11e6ae26baa..f9e14911918c 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -593,6 +593,13 @@ finished:
 	return 0;
 }
 
+static int ext4_dir_open(struct inode * inode, struct file * filp)
+{
+	if (ext4_encrypted_inode(inode))
+		return ext4_get_encryption_info(inode) ? -EACCES : 0;
+	return 0;
+}
+
 static int ext4_release_dir(struct inode *inode, struct file *filp)
 {
 	if (filp->private_data)
@@ -635,5 +642,6 @@ const struct file_operations ext4_dir_operations = {
 	.compat_ioctl	= ext4_compat_ioctl,
 #endif
 	.fsync		= ext4_sync_file,
+	.open		= ext4_dir_open,
 	.release	= ext4_release_dir,
 };