From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751731AbcBNK4h (ORCPT ); Sun, 14 Feb 2016 05:56:37 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:39747 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbcBNK4g (ORCPT ); Sun, 14 Feb 2016 05:56:36 -0500 X-AuditID: cbfee61b-f793c6d00000236c-82-56c05d6295d2 From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, tytso@mit.edu Subject: [PATCH 5/7] f2fs crypto: set up encryption info for new inodes in f2fs_inherit_context() Date: Sun, 14 Feb 2016 18:55:49 +0800 Message-id: <00fe01d16716$5ec0a540$1c41efc0$@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: AdFnFiho/x/mQanASZOTNPumVF8cew== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRmVeSWpSXmKPExsVy+t9jAd2k2ANhBvfPm1g8WT+L2eLSIneL y7vmsFm09vxkd2Dx2LSqk81j94LPTB5NZ44ye3zeJBfAEsVlk5Kak1mWWqRvl8CVMfPsOraC 9xwVb7cHNzAeYu9i5OSQEDCRODRlFRuELSZx4d56IJuLQ0hgKaPEgtc/mSCcV4wSn46fYAKp YhNQkVje8R/MFgGyDy26DDaJWSBSomnNd7BJwgLJEotuTWUEsVkEVCWubn4LZvMKWEp0P7zL DmELSvyYfI8FoldLYvO2JlYIW15i85q3zBAXKUjsOPuaEWKXnsSuQzeYIWrEJTYeucUygVFg FpJRs5CMmoVk1CwkLQsYWVYxSqQWJBcUJ6XnGuWllusVJ+YWl+al6yXn525iBAf2M+kdjId3 uR9iFOBgVOLh3bFyf5gQa2JZcWXuIUYJDmYlEV6H6ANhQrwpiZVVqUX58UWlOanFhxilOViU xHkf/18XJiSQnliSmp2aWpBaBJNl4uCUamA0n3O20XzVuS59672TVj4XNlhZK60774wGswVz 0bwXN4oWz/Tzqi9dxba97H2/VM3FRaktVyJ7Na9Etlw1nRF4zfp5s/D+W1mnHfT7F8423CWV /Leew2fLq8XG/72fLJm91YNza0dl7lG/6xtsqtYv3lFwdJ3JpwsbZpjkKkltMq7duIZBwHKW EktxRqKhFnNRcSIAHJeqeWgCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch syncs f2fs with commit 555570295532 ("ext4 crypto: set up encryption info for new inodes in ext4_inherit_context()") from ext4. Set up the encryption information for newly created inodes immediately after they inherit their encryption context from their parent directories. Signed-off-by: Theodore Ts'o Signed-off-by: Chao Yu --- fs/f2fs/crypto_policy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/crypto_policy.c b/fs/f2fs/crypto_policy.c index d4a96af..0fb08b0 100644 --- a/fs/f2fs/crypto_policy.c +++ b/fs/f2fs/crypto_policy.c @@ -203,7 +203,10 @@ int f2fs_inherit_context(struct inode *parent, struct inode *child, F2FS_KEY_DESCRIPTOR_SIZE); get_random_bytes(ctx.nonce, F2FS_KEY_DERIVATION_NONCE_SIZE); - return f2fs_setxattr(child, F2FS_XATTR_INDEX_ENCRYPTION, + res = f2fs_setxattr(child, F2FS_XATTR_INDEX_ENCRYPTION, F2FS_XATTR_NAME_ENCRYPTION_CONTEXT, &ctx, sizeof(ctx), ipage, XATTR_CREATE); + if (!res) + res = f2fs_get_encryption_info(child); + return res; } -- 2.7.0.2.g1b0b6dd