Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bc445e0 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

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



Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 55557029

fs/ext4/dir.c

+8 −0
Original line number Diff line number Diff line
@@ -593,6 +593,13 @@ static int ext4_dx_readdir(struct file *file, struct dir_context *ctx) 
	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,

};