From: Eric Biggers <ebiggers@kernel.org>
To: linux-fscrypt@vger.kernel.org
Cc: Satya Tangirala <satyat@google.com>,
linux-api@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net, keyrings@vger.kernel.org,
linux-mtd@lists.infradead.org, linux-crypto@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
Paul Crowley <paulcrowley@google.com>
Subject: [PATCH v6 13/16] ext4: wire up new fscrypt ioctls
Date: Mon, 20 May 2019 10:25:49 -0700 [thread overview]
Message-ID: <20190520172552.217253-14-ebiggers@kernel.org> (raw)
In-Reply-To: <20190520172552.217253-1-ebiggers@kernel.org>
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 ext4_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>
---
fs/ext4/ioctl.c | 24 ++++++++++++++++++++++++
fs/ext4/super.c | 3 +++
2 files changed, 27 insertions(+)
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index e486e49b31ed7..b51b6384045b8 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -1092,6 +1092,26 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case EXT4_IOC_GET_ENCRYPTION_POLICY:
return fscrypt_ioctl_get_policy(filp, (void __user *)arg);
+ case FS_IOC_GET_ENCRYPTION_POLICY_EX:
+ if (!ext4_has_feature_encrypt(sb))
+ return -EOPNOTSUPP;
+ return fscrypt_ioctl_get_policy_ex(filp, (void __user *)arg);
+
+ case FS_IOC_ADD_ENCRYPTION_KEY:
+ if (!ext4_has_feature_encrypt(sb))
+ return -EOPNOTSUPP;
+ return fscrypt_ioctl_add_key(filp, (void __user *)arg);
+
+ case FS_IOC_REMOVE_ENCRYPTION_KEY:
+ if (!ext4_has_feature_encrypt(sb))
+ return -EOPNOTSUPP;
+ return fscrypt_ioctl_remove_key(filp, (const void __user *)arg);
+
+ case FS_IOC_GET_ENCRYPTION_KEY_STATUS:
+ if (!ext4_has_feature_encrypt(sb))
+ return -EOPNOTSUPP;
+ return fscrypt_ioctl_get_key_status(filp, (void __user *)arg);
+
case EXT4_IOC_FSGETXATTR:
{
struct fsxattr fa;
@@ -1210,6 +1230,10 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case EXT4_IOC_SET_ENCRYPTION_POLICY:
case EXT4_IOC_GET_ENCRYPTION_PWSALT:
case EXT4_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 EXT4_IOC_SHUTDOWN:
case FS_IOC_GETFSMAP:
break;
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4079605d437ae..757819139b8f7 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1107,6 +1107,9 @@ static int ext4_drop_inode(struct inode *inode)
{
int drop = generic_drop_inode(inode);
+ if (!drop)
+ drop = fscrypt_drop_inode(inode);
+
trace_ext4_drop_inode(inode, drop);
return drop;
}
--
2.21.0.1020.gf2820cf01a-goog
next prev parent reply other threads:[~2019-05-20 17:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 17:25 [PATCH v6 00/16] fscrypt: key management improvements Eric Biggers
2019-05-20 17:25 ` [PATCH v6 01/16] fs, fscrypt: move uapi definitions to new header <linux/fscrypt.h> Eric Biggers
2019-05-20 17:25 ` [PATCH v6 02/16] fscrypt: use FSCRYPT_ prefix for uapi constants Eric Biggers
2019-05-20 17:25 ` [PATCH v6 03/16] fscrypt: use FSCRYPT_* definitions, not FS_* Eric Biggers
2019-05-20 17:25 ` [PATCH v6 04/16] fscrypt: add ->ci_inode to fscrypt_info Eric Biggers
2019-05-20 17:25 ` [PATCH v6 05/16] fscrypt: refactor v1 policy key setup into keysetup_legacy.c Eric Biggers
2019-05-20 17:25 ` [PATCH v6 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl Eric Biggers
2019-05-20 17:25 ` [PATCH v6 07/16] fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl Eric Biggers
2019-05-20 17:25 ` [PATCH v6 08/16] fscrypt: add FS_IOC_GET_ENCRYPTION_KEY_STATUS ioctl Eric Biggers
2019-05-20 17:25 ` [PATCH v6 09/16] fscrypt: add an HKDF-SHA512 implementation Eric Biggers
2019-05-20 17:25 ` [PATCH v6 10/16] fscrypt: v2 encryption policy support Eric Biggers
2019-05-20 17:25 ` [PATCH v6 11/16] fscrypt: allow unprivileged users to add/remove keys for v2 policies Eric Biggers
2019-05-20 17:25 ` [PATCH v6 12/16] fscrypt: require that key be added when setting a v2 encryption policy Eric Biggers
2019-05-20 17:25 ` Eric Biggers [this message]
2019-05-20 17:25 ` [PATCH v6 14/16] f2fs: wire up new fscrypt ioctls Eric Biggers
2019-05-20 17:25 ` [PATCH v6 15/16] ubifs: " Eric Biggers
2019-05-20 17:25 ` [PATCH v6 16/16] fscrypt: document the new ioctls and policy version Eric Biggers
2019-05-21 0:16 ` [PATCH v6 00/16] fscrypt: key management improvements Theodore Ts'o
2019-05-21 0:41 ` Eric Biggers
2019-05-21 3:29 ` Theodore Ts'o
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=20190520172552.217253-14-ebiggers@kernel.org \
--to=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).