From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751781AbcBNK5m (ORCPT ); Sun, 14 Feb 2016 05:57:42 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:53733 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307AbcBNK5l (ORCPT ); Sun, 14 Feb 2016 05:57:41 -0500 X-AuditID: cbfee61a-f79266d000003652-6c-56c05da44484 From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, tytso@mit.edu Subject: [PATCH 6/7] f2fs crypto: make sure the encryption info is initialized on opendir(2) Date: Sun, 14 Feb 2016 18:56:55 +0800 Message-id: <00ff01d16716$85cf93d0$916ebb70$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdFnFk1fmZdQ3qyLT+OBGA0+L1u1XA== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRmVeSWpSXmKPExsVy+t9jQd0lsQfCDC5sFbd4sn4Ws8WlRe4W l3fNYbNo7fnJ7sDisWlVJ5vH7gWfmTyazhxl9vi8SS6AJYrLJiU1J7MstUjfLoEr49zN5awF V9grXm3Yyd7AOJeti5GTQ0LAROLltyZGCFtM4sK99UBxLg4hgVmMEg9nfYRyXjFKnN6/gx2k ik1ARWJ5x38mEFsEyD606DJYnFkgUqJpzXewqcICcRIPrl0Gq2ERUJWYuHIiWA2vgKXE108L mCFsQYkfk++xQPRqSWze1sQKYctLbF7zlhniIgWJHWdfA13HAbRLT2LCgkqIEnGJjUdusUxg BLoSYdIsJJNmIZk0C0nLAkaWVYwSqQXJBcVJ6bmGeanlesWJucWleel6yfm5mxjBgf1Magfj wV3uhxgFOBiVeHh3rNwfJsSaWFZcmXuIUYKDWUmE1yH6QJgQb0piZVVqUX58UWlOavEhRmkO FiVx3sf/14UJCaQnlqRmp6YWpBbBZJk4OKUaGAs/aTut2Jve9GPvpxud4dtfN61Ttws5brzq s9y+45P7I9YI73e+eeBb97dJcaeLfidbLGP02yYUOu2ej7VP66dLYRvWKnLK9xs+t4z/+tSW n/uHeGyk0pTb95ONnd5ECB0oNZ/0x8Hz7/cklmInaRefO+1cnu/z9nGs3h/EZC+z6dOmjnVr C5VYijMSDbWYi4oTAVa+lntoAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Chao Yu --- fs/f2fs/dir.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index ca41b2a..8f09da0 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -902,11 +902,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, -- 2.7.0.2.g1b0b6dd