@@ -332,6 +332,21 @@ static inline bool fscrypt_uses_extent_encryption(const struct inode *inode)
return false;
}
+/**
+ * fscrypt_fs_uses_extent_encryption() -- whether a filesystem uses per-extent
+ * encryption
+ *
+ * @sb: the superblock of the filesystem in question
+ *
+ * Return: true if the fs uses per-extent fscrypt_infos, false otherwise
+ */
+static inline bool
+fscrypt_fs_uses_extent_encryption(const struct super_block *sb)
+{
+ // No filesystems currently use per-extent infos
+ return false;
+}
+
/**
* fscrypt_get_info_ino() - get the ino or ino equivalent for an info
*
@@ -556,11 +571,14 @@ struct fscrypt_master_key {
/*
* The secret key material. After FS_IOC_REMOVE_ENCRYPTION_KEY is
- * executed, this is wiped and no new inodes can be unlocked with this
- * key; however, there may still be inodes in ->mk_decrypted_inodes
- * which could not be evicted. As long as some inodes still remain,
- * FS_IOC_REMOVE_ENCRYPTION_KEY can be retried, or
- * FS_IOC_ADD_ENCRYPTION_KEY can add the secret again.
+ * executed, no new inodes can be unlocked with this key; however,
+ * there may still be inodes in ->mk_decrypted_inodes which could not
+ * be evicted. For inode-based encryption, the secret is wiped; for
+ * extent-based encryption, the secret is preserved while inodes still
+ * reference it, as they may need to create new extents using the
+ * secret to service IO; @soft_deleted is set to true then. As long as
+ * some inodes still remain, FS_IOC_REMOVE_ENCRYPTION_KEY can be
+ * retried, or FS_IOC_ADD_ENCRYPTION_KEY can add the secret again.
*
* While ->mk_secret is present, one ref in ->mk_active_refs is held.
*
@@ -599,6 +617,13 @@ struct fscrypt_master_key {
struct list_head mk_decrypted_inodes;
spinlock_t mk_decrypted_inodes_lock;
+ /*
+ * Whether the key is unavailable to new inodes, but still available
+ * to new extents within decrypted inodes. Protected by
+ * ->mk_decrypted_inodes_lock.
+ */
+ bool mk_soft_deleted;
+
/*
* Per-mode encryption keys for the various types of encryption policies
* that use them. Allocated and derived on-demand.
@@ -626,6 +651,8 @@ is_master_key_secret_present(const struct fscrypt_master_key_secret *secret)
return READ_ONCE(secret->size) != 0;
}
+void fscrypt_wipe_master_key_secret(struct fscrypt_master_key_secret *secret);
+
static inline const char *master_key_spec_type(
const struct fscrypt_key_specifier *spec)
{
@@ -38,7 +38,7 @@ struct fscrypt_keyring {
struct hlist_head key_hashtable[128];
};
-static void wipe_master_key_secret(struct fscrypt_master_key_secret *secret)
+void fscrypt_wipe_master_key_secret(struct fscrypt_master_key_secret *secret)
{
fscrypt_destroy_hkdf(&secret->hkdf);
memzero_explicit(secret, sizeof(*secret));
@@ -239,8 +239,9 @@ void fscrypt_destroy_keyring(struct super_block *sb)
*/
WARN_ON_ONCE(refcount_read(&mk->mk_active_refs) != 1);
WARN_ON_ONCE(refcount_read(&mk->mk_struct_refs) != 1);
- WARN_ON_ONCE(!is_master_key_secret_present(&mk->mk_secret));
- wipe_master_key_secret(&mk->mk_secret);
+ WARN_ON_ONCE(!mk->mk_soft_deleted &&
+ !is_master_key_secret_present(&mk->mk_secret));
+ fscrypt_wipe_master_key_secret(&mk->mk_secret);
fscrypt_put_master_key_activeref(sb, mk);
}
}
@@ -485,6 +486,10 @@ static int add_existing_master_key(struct fscrypt_master_key *mk,
move_master_key_secret(&mk->mk_secret, secret);
}
+ spin_lock(&mk->mk_decrypted_inodes_lock);
+ mk->mk_soft_deleted = false;
+ spin_unlock(&mk->mk_decrypted_inodes_lock);
+
return 0;
}
@@ -738,7 +743,7 @@ int fscrypt_ioctl_add_key(struct file *filp, void __user *_uarg)
goto out_wipe_secret;
err = 0;
out_wipe_secret:
- wipe_master_key_secret(&secret);
+ fscrypt_wipe_master_key_secret(&secret);
return err;
}
EXPORT_SYMBOL_GPL(fscrypt_ioctl_add_key);
@@ -770,7 +775,7 @@ int fscrypt_get_test_dummy_key_identifier(
NULL, 0, key_identifier,
FSCRYPT_KEY_IDENTIFIER_SIZE);
out:
- wipe_master_key_secret(&secret);
+ fscrypt_wipe_master_key_secret(&secret);
return err;
}
@@ -794,7 +799,7 @@ int fscrypt_add_test_dummy_key(struct super_block *sb,
fscrypt_get_test_dummy_secret(&secret);
err = add_master_key(sb, &secret, key_spec);
- wipe_master_key_secret(&secret);
+ fscrypt_wipe_master_key_secret(&secret);
return err;
}
@@ -1026,6 +1031,12 @@ static int do_remove_key(struct file *filp, void __user *_uarg, bool all_users)
mk = fscrypt_find_master_key(sb, &arg.key_spec);
if (!mk)
return -ENOKEY;
+
+ if (fscrypt_fs_uses_extent_encryption(sb)) {
+ /* Keep going even if this has an error. */
+ try_to_lock_encrypted_files(sb, mk);
+ }
+
down_write(&mk->mk_sem);
/* If relevant, remove current user's (or all users) claim to the key */
@@ -1052,13 +1063,23 @@ static int do_remove_key(struct file *filp, void __user *_uarg, bool all_users)
}
}
- /* No user claims remaining. Go ahead and wipe the secret. */
+ /* No user claims remaining. */
err = -ENOKEY;
- if (is_master_key_secret_present(&mk->mk_secret)) {
- wipe_master_key_secret(&mk->mk_secret);
+ if (fscrypt_fs_uses_extent_encryption(sb) && refcount_read(&mk->mk_active_refs) > 1) {
+ mk->mk_soft_deleted = true;
+ err = 0;
+ } else if (is_master_key_secret_present(&mk->mk_secret)) {
+ fscrypt_wipe_master_key_secret(&mk->mk_secret);
fscrypt_put_master_key_activeref(sb, mk);
err = 0;
+ } else if (mk->mk_soft_deleted) {
+ /*
+ * Was soft deleted, but all inodes have stopped using it, and
+ * the secret was wiped by the last one.
+ */
+ err = 0;
}
+
inodes_remain = refcount_read(&mk->mk_active_refs) > 0;
up_write(&mk->mk_sem);
@@ -1159,7 +1180,7 @@ int fscrypt_ioctl_get_key_status(struct file *filp, void __user *uarg)
}
down_read(&mk->mk_sem);
- if (!is_master_key_secret_present(&mk->mk_secret)) {
+ if (mk->mk_soft_deleted || !is_master_key_secret_present(&mk->mk_secret)) {
arg.status = refcount_read(&mk->mk_active_refs) > 0 ?
FSCRYPT_KEY_STATUS_INCOMPLETELY_REMOVED :
FSCRYPT_KEY_STATUS_ABSENT /* raced with full removal */;
@@ -576,6 +576,15 @@ static int find_and_lock_master_key(const struct fscrypt_info *ci,
goto out_release_key;
}
+ if (!ci->ci_info_ptr && mk->mk_soft_deleted) {
+ /*
+ * This is an inode info, and only extent infos can use keys
+ * that have been soft deleted
+ */
+ err = -ENOKEY;
+ goto out_release_key;
+ }
+
*mk_ret = mk;
return 0;
@@ -606,6 +615,8 @@ static void put_crypt_info(struct fscrypt_info *ci)
mk = ci->ci_master_key;
if (mk) {
+ bool wipe_secret = false;
+
/*
* Remove this inode from the list of inodes that were unlocked
* with the master key. In addition, if we're removing the last
@@ -614,7 +625,25 @@ static void put_crypt_info(struct fscrypt_info *ci)
*/
spin_lock(&mk->mk_decrypted_inodes_lock);
list_del(&ci->ci_master_key_link);
+ wipe_secret = (list_empty(&mk->mk_decrypted_inodes) &&
+ mk->mk_soft_deleted);
spin_unlock(&mk->mk_decrypted_inodes_lock);
+ if (wipe_secret) {
+ /* Someone tried to remove this key, but there were
+ * still inodes open that could need new extents, which
+ * needed to be able to access the key secret. But now
+ * this was the last reference. So we can delete the
+ * key secret now. (We don't need to check for new
+ * inodes on the decrypted_inode list because once
+ * ->mk_soft_deleted is set, no new inode can join the
+ * list.
+ */
+ down_write(&mk->mk_sem);
+ fscrypt_wipe_master_key_secret(&mk->mk_secret);
+ up_write(&mk->mk_sem);
+ fscrypt_put_master_key_activeref(ci->ci_sb, mk);
+ }
+
fscrypt_put_master_key_activeref(ci->ci_sb, mk);
}
memzero_explicit(ci, sizeof(*ci));
@@ -958,6 +987,7 @@ int fscrypt_drop_inode(struct inode *inode)
* then the thread removing the key will either evict the inode itself
* or will correctly detect that it wasn't evicted due to the race.
*/
- return !is_master_key_secret_present(&ci->ci_master_key->mk_secret);
+ return READ_ONCE(ci->ci_master_key->mk_soft_deleted) ||
+ !is_master_key_secret_present(&ci->ci_master_key->mk_secret);
}
EXPORT_SYMBOL_GPL(fscrypt_drop_inode);
Currently, for inode encryption, once an inode is open IO will not fail due to lack of key until the inode is closed. Even if the key is removed, open inodes will continue to use the key. For extent encryption, it's a little harder, since the extent may not be createdi/loaded until well after the REMOVE_KEY ioctl is called. To be as similar to inode based encryption as plausible, this changes key removal to be 'soft' for extent-based encryption, allowing new extents to use keys which were in use by open inodes at the time of removal; this hopefully follows the discussion at [1]. [1] https://lore.kernel.org/linux-fscrypt/248eac32-96cc-eb2e-85da-422a8d75a376@dorminy.me/T/#m48f43837cf98e0212de2e70aa6435320e3532d6e Signed-off-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me> --- fs/crypto/fscrypt_private.h | 37 ++++++++++++++++++++++++++++----- fs/crypto/keyring.c | 41 ++++++++++++++++++++++++++++--------- fs/crypto/keysetup.c | 32 ++++++++++++++++++++++++++++- 3 files changed, 94 insertions(+), 16 deletions(-)