From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA167C32750 for ; Fri, 2 Aug 2019 08:10:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A61FF2086A for ; Fri, 2 Aug 2019 08:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403888AbfHBIK2 (ORCPT ); Fri, 2 Aug 2019 04:10:28 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:3700 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730124AbfHBIK2 (ORCPT ); Fri, 2 Aug 2019 04:10:28 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id BB2431235F7661B2BA51; Fri, 2 Aug 2019 16:10:21 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.213) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 2 Aug 2019 16:10:17 +0800 Subject: Re: [PATCH v7 14/16] f2fs: wire up new fscrypt ioctls To: Eric Biggers , CC: , , , , , , , Paul Crowley , "Satya Tangirala" References: <20190726224141.14044-1-ebiggers@kernel.org> <20190726224141.14044-15-ebiggers@kernel.org> From: Chao Yu Message-ID: Date: Fri, 2 Aug 2019 16:10:15 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190726224141.14044-15-ebiggers@kernel.org> Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Hi Eric, On 2019/7/27 6:41, Eric Biggers wrote: > From: Eric Biggers > > Wire up the new ioctls for adding and removing fscrypt keys to/from the > filesystem, and the new ioctl for retrieving v2 encryption policies. > > FS_IOC_REMOVE_ENCRYPTION_KEY also required making f2fs_drop_inode() call > fscrypt_drop_inode(). > > For more details see Documentation/filesystems/fscrypt.rst and the > fscrypt patches that added the implementation of these ioctls. > > Signed-off-by: Eric Biggers Reviewed-by: Chao Yu BTW, do you think it needs to make xxfs_has_support_encrypt() function be a common interface defined in struct fscrypt_operations, as I see all fscrypt_ioctl_*() needs to check with it, tho such cleanup is minor... Thanks, > --- > fs/f2fs/file.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > fs/f2fs/super.c | 2 ++ > 2 files changed, 48 insertions(+) > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index f8d46df8fa9ee..d81dda290b829 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -2184,6 +2184,40 @@ static int f2fs_ioc_get_encryption_pwsalt(struct file *filp, unsigned long arg) > return err; > } > > +static int f2fs_ioc_get_encryption_policy_ex(struct file *filp, > + unsigned long arg) > +{ > + if (!f2fs_sb_has_encrypt(F2FS_I_SB(file_inode(filp)))) > + return -EOPNOTSUPP; > + > + return fscrypt_ioctl_get_policy_ex(filp, (void __user *)arg); > +} > + > +static int f2fs_ioc_add_encryption_key(struct file *filp, unsigned long arg) > +{ > + if (!f2fs_sb_has_encrypt(F2FS_I_SB(file_inode(filp)))) > + return -EOPNOTSUPP; > + > + return fscrypt_ioctl_add_key(filp, (void __user *)arg); > +} > + > +static int f2fs_ioc_remove_encryption_key(struct file *filp, unsigned long arg) > +{ > + if (!f2fs_sb_has_encrypt(F2FS_I_SB(file_inode(filp)))) > + return -EOPNOTSUPP; > + > + return fscrypt_ioctl_remove_key(filp, (const void __user *)arg); > +} > + > +static int f2fs_ioc_get_encryption_key_status(struct file *filp, > + unsigned long arg) > +{ > + if (!f2fs_sb_has_encrypt(F2FS_I_SB(file_inode(filp)))) > + return -EOPNOTSUPP; > + > + return fscrypt_ioctl_get_key_status(filp, (void __user *)arg); > +} > + > static int f2fs_ioc_gc(struct file *filp, unsigned long arg) > { > struct inode *inode = file_inode(filp); > @@ -3109,6 +3143,14 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > return f2fs_ioc_get_encryption_policy(filp, arg); > case F2FS_IOC_GET_ENCRYPTION_PWSALT: > return f2fs_ioc_get_encryption_pwsalt(filp, arg); > + case FS_IOC_GET_ENCRYPTION_POLICY_EX: > + return f2fs_ioc_get_encryption_policy_ex(filp, arg); > + case FS_IOC_ADD_ENCRYPTION_KEY: > + return f2fs_ioc_add_encryption_key(filp, arg); > + case FS_IOC_REMOVE_ENCRYPTION_KEY: > + return f2fs_ioc_remove_encryption_key(filp, arg); > + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: > + return f2fs_ioc_get_encryption_key_status(filp, arg); > case F2FS_IOC_GARBAGE_COLLECT: > return f2fs_ioc_gc(filp, arg); > case F2FS_IOC_GARBAGE_COLLECT_RANGE: > @@ -3236,6 +3278,10 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > case F2FS_IOC_SET_ENCRYPTION_POLICY: > case F2FS_IOC_GET_ENCRYPTION_PWSALT: > case F2FS_IOC_GET_ENCRYPTION_POLICY: > + case FS_IOC_GET_ENCRYPTION_POLICY_EX: > + case FS_IOC_ADD_ENCRYPTION_KEY: > + case FS_IOC_REMOVE_ENCRYPTION_KEY: > + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: > case F2FS_IOC_GARBAGE_COLLECT: > case F2FS_IOC_GARBAGE_COLLECT_RANGE: > case F2FS_IOC_WRITE_CHECKPOINT: > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 6de6cda440315..f5fae8d511a20 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -913,6 +913,8 @@ static int f2fs_drop_inode(struct inode *inode) > return 0; > } > ret = generic_drop_inode(inode); > + if (!ret) > + ret = fscrypt_drop_inode(inode); > trace_f2fs_drop_inode(inode, ret); > return ret; > } >