From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Eric Biggers <ebiggers@kernel.org>
Cc: linux-fscrypt@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-mtd@lists.infradead.org, linux-api@vger.kernel.org,
linux-crypto@vger.kernel.org, keyrings@vger.kernel.org,
Paul Crowley <paulcrowley@google.com>,
Satya Tangirala <satyat@google.com>
Subject: Re: [PATCH v7 14/16] f2fs: wire up new fscrypt ioctls
Date: Mon, 29 Jul 2019 17:36:24 -0700 [thread overview]
Message-ID: <20190730003624.GA47389@jaegeuk-macbookpro.roam.corp.google.com> (raw)
In-Reply-To: <20190726224141.14044-15-ebiggers@kernel.org>
On 07/26, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> 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 <ebiggers@google.com>
Acked-by: Jaegeuk Kim <jaegeuk@kernel.org>
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;
> }
> --
> 2.22.0
next prev parent reply other threads:[~2019-07-30 0:36 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 22:41 [PATCH v7 00/16] fscrypt: key management improvements Eric Biggers
2019-07-26 22:41 ` [PATCH v7 01/16] fs, fscrypt: move uapi definitions to new header <linux/fscrypt.h> Eric Biggers
2019-07-28 15:08 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 02/16] fscrypt: use FSCRYPT_ prefix for uapi constants Eric Biggers
2019-07-26 22:41 ` [PATCH v7 03/16] fscrypt: use FSCRYPT_* definitions, not FS_* Eric Biggers
2019-07-26 22:41 ` [PATCH v7 04/16] fscrypt: add ->ci_inode to fscrypt_info Eric Biggers
2019-07-28 15:09 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 05/16] fscrypt: refactor v1 policy key setup into keysetup_legacy.c Eric Biggers
2019-07-28 15:40 ` Theodore Y. Ts'o
2019-07-29 19:37 ` Eric Biggers
2019-07-26 22:41 ` [PATCH v7 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl Eric Biggers
2019-07-28 18:50 ` Theodore Y. Ts'o
2019-07-29 19:46 ` Eric Biggers
2019-07-29 20:14 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 07/16] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl Eric Biggers
2019-07-28 19:24 ` Theodore Y. Ts'o
2019-07-29 19:58 ` Eric Biggers
2019-07-31 18:38 ` Eric Biggers
2019-07-31 23:38 ` Theodore Y. Ts'o
2019-08-01 1:11 ` [f2fs-dev] " Eric Biggers
2019-08-01 5:31 ` Theodore Y. Ts'o
2019-08-01 18:35 ` Eric Biggers
2019-08-01 18:46 ` Eric Biggers
2019-08-01 22:04 ` Eric Biggers
2019-08-02 4:38 ` Eric Biggers
2019-08-12 14:16 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 08/16] fscrypt: add FS_IOC_GET_ENCRYPTION_KEY_STATUS ioctl Eric Biggers
2019-07-28 19:30 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 09/16] fscrypt: add an HKDF-SHA512 implementation Eric Biggers
2019-07-28 19:39 ` Theodore Y. Ts'o
2019-07-29 20:29 ` Eric Biggers
2019-07-29 21:42 ` James Bottomley
2019-07-26 22:41 ` [PATCH v7 10/16] fscrypt: v2 encryption policy support Eric Biggers
2019-07-28 21:17 ` Theodore Y. Ts'o
2019-07-29 20:46 ` Eric Biggers
2019-07-26 22:41 ` [PATCH v7 11/16] fscrypt: allow unprivileged users to add/remove keys for v2 policies Eric Biggers
2019-07-28 21:22 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 12/16] fscrypt: require that key be added when setting a v2 encryption policy Eric Biggers
2019-07-28 21:24 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 13/16] ext4: wire up new fscrypt ioctls Eric Biggers
2019-07-28 21:24 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 14/16] f2fs: " Eric Biggers
2019-07-30 0:36 ` Jaegeuk Kim [this message]
2019-08-02 8:10 ` Chao Yu
2019-08-02 17:31 ` Eric Biggers
2019-08-04 9:42 ` [f2fs-dev] " Chao Yu
2019-07-26 22:41 ` [PATCH v7 15/16] ubifs: " Eric Biggers
2019-07-30 0:39 ` Theodore Y. Ts'o
2019-07-26 22:41 ` [PATCH v7 16/16] fscrypt: document the new ioctls and policy version Eric Biggers
2019-07-29 2:00 ` Theodore Y. Ts'o
2019-07-29 21:36 ` Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190730003624.GA47389@jaegeuk-macbookpro.roam.corp.google.com \
--to=jaegeuk@kernel.org \
--cc=ebiggers@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=paulcrowley@google.com \
--cc=satyat@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).