This is a note to let you know that I've just added the patch titled
f2fs crypto: make sure the encryption info is initialized on opendir(2)
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
f2fs-crypto-make-sure-the-encryption-info-is-initialized-on-opendir-2.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ed3360abbc0412f32c398e1c58887d74f3d04225 Mon Sep 17 00:00:00 2001
From: Chao Yu <chao2.yu@xxxxxxxxxxx>
Date: Sun, 14 Feb 2016 18:56:55 +0800
Subject: f2fs crypto: make sure the encryption info is initialized on opendir(2)
From: Chao Yu <chao2.yu@xxxxxxxxxxx>
commit ed3360abbc0412f32c398e1c58887d74f3d04225 upstream.
This patch syncs f2fs with commit 6bc445e0ff44 ("ext4 crypto: make
sure the encryption info is initialized on opendir(2)") from ext4.
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Chao Yu <chao2.yu@xxxxxxxxxxx>
Signed-off-by: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/f2fs/dir.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -892,11 +892,19 @@ out:
return err;
}
+static int f2fs_dir_open(struct inode *inode, struct file *filp)
+{
+ if (f2fs_encrypted_inode(inode))
+ return f2fs_get_encryption_info(inode) ? -EACCES : 0;
+ return 0;
+}
+
const struct file_operations f2fs_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.iterate = f2fs_readdir,
.fsync = f2fs_sync_file,
+ .open = f2fs_dir_open,
.unlocked_ioctl = f2fs_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = f2fs_compat_ioctl,
Patches currently in stable-queue which might be from chao2.yu@xxxxxxxxxxx are
queue-4.5/f2fs-crypto-handle-unexpected-lack-of-encryption-keys.patch
queue-4.5/f2fs-crypto-make-sure-the-encryption-info-is-initialized-on-opendir-2.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html