fscrypt: fscrypt_supported_policy() fixes and cleanups
Eric Biggers
maintainercover fscrypt: fscrypt_supported_policy() fixes and cleanups
Make FS_IOC_SET_ENCRYPTION_POLICY start rejecting the DIRECT_KEY flag when it's incompatible with the selected encryption modes, instead of delaying this check until later when actually trying to set up the directory's key.
Also make some related cleanups, such as splitting fscrypt_supported_policy() into a separate function for each encryption policy version.
Eric Biggers (4):
fscrypt: split up fscrypt_supported_policy() by policy version
fscrypt: check for appropriate use of DIRECT_KEY flag earlier
fscrypt: move fscrypt_valid_enc_modes() to policy.c
fscrypt: remove fscrypt_is_direct_key_policy()
fs/crypto/fscrypt_private.h | 30 +------ fs/crypto/keysetup.c | 14 +--- fs/crypto/keysetup_v1.c | 15 ---- fs/crypto/policy.c | 163 +++++++++++++++++++++++------------- 4 files changed, 111 insertions(+), 111 deletions(-)
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Eric Biggers
maintainerPATCH 1/4 fscrypt: split up fscrypt_supported_policy() by policy version
From: Eric Biggers <[email protected]>
Make fscrypt_supported_policy() call new functions fscrypt_supported_v1_policy() and fscrypt_supported_v2_policy(), to reduce the indentation level and make the code easier to read.
Also adjust the function comment to mention that whether the encryption policy is supported can also depend on the inode.
No change in behavior.
--- fs/crypto/policy.c | 116 +++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 57 deletions(-)
fs/crypto/policy.c +59 -57
@@ -63,13 +63,65 @@ static bool supported_iv_ino_lblk_64_policy(return true; } +static bool fscrypt_supported_v1_policy (const struct fscrypt_policy_v1 *policy, +const struct inode *inode) +{ +if (!fscrypt_valid_enc_modes (policy->contents_encryption_mode, + policy->filenames_encryption_mode)) { +fscrypt_warn (inode, +"Unsupported encryption modes (contents %d, filenames %d)" , + policy->contents_encryption_mode, + policy->filenames_encryption_mode); +return false; + } + +if (policy->flags & ~(FSCRYPT_POLICY_FLAGS_PAD_MASK | +FSCRYPT_POLICY_FLAG_DIRECT_KEY )) { +fscrypt_warn (inode,"Unsupported encryption flags (0x%02x)" , + policy->flags); +return false; + } + +return true; +} + +static bool fscrypt_supported_v2_policy (const struct fscrypt_policy_v2 *policy, +const struct inode *inode) +{ +if (!fscrypt_valid_enc_modes (policy->contents_encryption_mode, + policy->filenames_encryption_mode)) { +fscrypt_warn (inode, +"Unsupported encryption modes (contents %d, filenames %d)" , + policy->contents_encryption_mode, + policy->filenames_encryption_mode); +return false; + } + +if (policy->flags & ~FSCRYPT_POLICY_FLAGS_VALID ) { +fscrypt_warn (inode,"Unsupported encryption flags (0x%02x)" , + policy->flags); +return false; + } + +if ((policy->flags &FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 ) && + !supported_iv_ino_lblk_64_policy (policy, inode)) +return false; + +if (memchr_inv (policy->__reserved,0 ,sizeof (policy->__reserved))) { +fscrypt_warn (inode,"Reserved bits set in encryption policy" ); +return false; + } + +return true; +} +/** * fscrypt_supported_policy - check whether an encryption policy is supported * * Given an encryption policy, check whether all its encryption modes and other -* settings are supported by this kernel. (But we don't currently don't check -* for crypto API support here, so attempting to use an algorithm not configured -* into the crypto API will still fail later.) +* settings are supported by this kernel on the given inode. (But we don't +* currently don't check for crypto API support here, so attempting to use an +* algorithm not configured into the crypto API will still fail later.) * * Return: %true if supported, else %false */
@@ -77,60 +129,10 @@ bool fscrypt_supported_policy(const union fscrypt_policy *policy_u, const struct inode *inode) {switch (policy_u->version) { -case FSCRYPT_POLICY_V1 : { -const struct fscrypt_policy_v1 *policy = &policy_u->v1; - -if (!fscrypt_valid_enc_modes (policy->contents_encryption_mode, - policy->filenames_encryption_mode)) { -fscrypt_warn (inode, -"Unsupported encryption modes (contents %d, filenames %d)" , - policy->contents_encryption_mode, - policy->filenames_encryption_mode); -return false; - } - -if (policy->flags & ~(FSCRYPT_POLICY_FLAGS_PAD_MASK | -FSCRYPT_POLICY_FLAG_DIRECT_KEY )) { -fscrypt_warn (inode, -"Unsupported encryption flags (0x%02x)" , - policy->flags); -return false; - } - -return true; - } -case FSCRYPT_POLICY_V2 : { -const struct fscrypt_policy_v2 *policy = &policy_u->v2; - -if (!fscrypt_valid_enc_modes (policy->contents_encryption_mode, - policy->filenames_encryption_mode)) { -fscrypt_warn (inode, -"Unsupported encryption modes (contents %d, filenames %d)" , - policy->contents_encryption_mode, - policy->filenames_encryption_mode); -return false; - } - -if (policy->flags & ~FSCRYPT_POLICY_FLAGS_VALID ) { -fscrypt_warn (inode, -"Unsupported encryption flags (0x%02x)" , - policy->flags); -return false; - } - -if ((policy->flags &FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 ) && - !supported_iv_ino_lblk_64_policy (policy, inode)) -return false; - -if (memchr_inv (policy->__reserved,0 , -sizeof (policy->__reserved))) { -fscrypt_warn (inode, -"Reserved bits set in encryption policy" ); -return false; - } - -return true; - } +case FSCRYPT_POLICY_V1 : +return fscrypt_supported_v1_policy (&policy_u->v1, inode); +case FSCRYPT_POLICY_V2 : +return fscrypt_supported_v2_policy (&policy_u->v2, inode); }return false; }
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Eric Biggers
maintainerPATCH 3/4 fscrypt: move fscrypt_valid_enc_modes() to policy.c
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
fscrypt_valid_enc_modes() is only used by policy.c, so move it to there.
Also adjust the order of the checks to be more natural, matching the numerical order of the constants and also keeping AES-256 (the recommended default) first in the list.
No change in behavior.
--- fs/crypto/fscrypt_private.h | 18 ------------------ fs/crypto/policy.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-)
fs/crypto/fscrypt_private.h +0 -18
@@ -206,24 +206,6 @@ typedef enum {FS_ENCRYPT , } fscrypt_direction_t; -static inline bool fscrypt_valid_enc_modes (u32 contents_mode, -u32 filenames_mode) -{ -if (contents_mode ==FSCRYPT_MODE_AES_128_CBC && - filenames_mode ==FSCRYPT_MODE_AES_128_CTS ) -return true; - -if (contents_mode ==FSCRYPT_MODE_AES_256_XTS && - filenames_mode ==FSCRYPT_MODE_AES_256_CTS ) -return true; - -if (contents_mode ==FSCRYPT_MODE_ADIANTUM && - filenames_mode ==FSCRYPT_MODE_ADIANTUM ) -return true; - -return false; -} -/* crypto.c */ extern struct kmem_cache *fscrypt_info_cachep;extern int fscrypt_initialize (unsigned int cop_flags);
fs/crypto/policy.c +17 -0
@@ -29,6 +29,23 @@ bool fscrypt_policies_equal(const union fscrypt_policy *policy1,return !memcmp (policy1, policy2,fscrypt_policy_size (policy1)); } +static bool fscrypt_valid_enc_modes (u32 contents_mode,u32 filenames_mode) +{ +if (contents_mode ==FSCRYPT_MODE_AES_256_XTS && + filenames_mode ==FSCRYPT_MODE_AES_256_CTS ) +return true; + +if (contents_mode ==FSCRYPT_MODE_AES_128_CBC && + filenames_mode ==FSCRYPT_MODE_AES_128_CTS ) +return true; + +if (contents_mode ==FSCRYPT_MODE_ADIANTUM && + filenames_mode ==FSCRYPT_MODE_ADIANTUM ) +return true; + +return false; +} +static bool supported_direct_key_modes (const struct inode *inode,u32 contents_mode,u32 filenames_mode) {
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Eric Biggers
maintainerPATCH 4/4 fscrypt: remove fscrypt_is_direct_key_policy()
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
fscrypt_is_direct_key_policy() is no longer used, so remove it.
--- fs/crypto/fscrypt_private.h | 6 ------ 1 file changed, 6 deletions(-)
fs/crypto/fscrypt_private.h +0 -6
@@ -136,12 +136,6 @@ fscrypt_policy_flags(const union fscrypt_policy *policy)BUG (); } -static inline bool -fscrypt_is_direct_key_policy (const union fscrypt_policy *policy) -{ -return fscrypt_policy_flags (policy) &FSCRYPT_POLICY_FLAG_DIRECT_KEY ; -} -/** * For encrypted symlinks, the ciphertext length is stored at the beginning * of the string in little-endian format.
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Eric Biggers
maintainerPATCH 2/4 fscrypt: check for appropriate use of DIRECT_KEY flag earlier
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
FSCRYPT_POLICY_FLAG_DIRECT_KEY is currently only allowed with Adiantum encryption. But FS_IOC_SET_ENCRYPTION_POLICY allowed it in combination with other encryption modes, and an error wasn't reported until later when the encrypted directory was actually used.
Fix it to report the error earlier by validating the correct use of the DIRECT_KEY flag in fscrypt_supported_policy(), similar to how we validate the IV_INO_LBLK_64 flag.
--- fs/crypto/fscrypt_private.h | 6 +----- fs/crypto/keysetup.c | 14 ++++---------- fs/crypto/keysetup_v1.c | 15 --------------- fs/crypto/policy.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 30 deletions(-)
fs/crypto/fscrypt_private.h +1 -5
@@ -448,11 +448,7 @@ struct fscrypt_mode {int logged_impl_name; }; -static inline bool -fscrypt_mode_supports_direct_key (const struct fscrypt_mode *mode) -{ - return mode->ivsize >= offsetofend(union fscrypt_iv, nonce); -} +extern struct fscrypt_mode fscrypt_modes[];extern struct crypto_skcipher * fscrypt_allocate_skcipher(struct fscrypt_mode *mode, const u8 *raw_key,
fs/crypto/keysetup.c +4 -10
@@ -13,7 +13,7 @@#include "fscrypt_private.h" -static struct fscrypt_mode available_modes[] = { +struct fscrypt_mode fscrypt_modes[] = { [FSCRYPT_MODE_AES_256_XTS ] = { .friendly_name ="AES-256-XTS" , .cipher_str ="xts(aes)" ,
@@ -51,10 +51,10 @@ select_encryption_mode(const union fscrypt_policy *policy, const struct inode *inode) {if (S_ISREG (inode->i_mode)) -return &available_modes[fscrypt_policy_contents_mode (policy)]; +return &fscrypt_modes[fscrypt_policy_contents_mode (policy)];if (S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)) -return &available_modes[fscrypt_policy_fnames_mode (policy)]; +return &fscrypt_modes[fscrypt_policy_fnames_mode (policy)];WARN_ONCE (1 ,"fscrypt: filesystem tried to load encryption info for inode %lu, which is not encryptable (file type %d)\n" , inode->i_ino, (inode->i_mode &S_IFMT ));
@@ -129,7 +129,7 @@ static int setup_per_mode_key(struct fscrypt_info *ci,const struct inode *inode = ci->ci_inode;const struct super_block *sb = inode->i_sb;struct fscrypt_mode *mode = ci->ci_mode; -u8 mode_num = mode - available_modes; +const u8 mode_num = mode - fscrypt_modes;struct crypto_skcipher *tfm, *prev_tfm;u8 mode_key[FSCRYPT_MAX_KEY_SIZE ];u8 hkdf_info[sizeof (mode_num) +sizeof (sb->s_uuid)];
@@ -189,12 +189,6 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci,* This ensures that the master key is consistently used only * for HKDF, avoiding key reuse issues. */ -if (!fscrypt_mode_supports_direct_key (ci->ci_mode)) { -fscrypt_warn (ci->ci_inode, -"Direct key flag not allowed with %s" , - ci->ci_mode->friendly_name); -return -EINVAL ; - }return setup_per_mode_key (ci, mk, mk->mk_direct_tfms,HKDF_CONTEXT_DIRECT_KEY , false); } else if (ci->ci_policy.v2.flags &
fs/crypto/keysetup_v1.c +0 -15
@@ -253,23 +253,8 @@ fscrypt_get_direct_key(const struct fscrypt_info *ci, const u8 *raw_key)static int setup_v1_file_key_direct (struct fscrypt_info *ci,const u8 *raw_master_key) { -const struct fscrypt_mode *mode = ci->ci_mode;struct fscrypt_direct_key *dk; -if (!fscrypt_mode_supports_direct_key (mode)) { -fscrypt_warn (ci->ci_inode, -"Direct key mode not allowed with %s" , - mode->friendly_name); -return -EINVAL ; - } - -if (ci->ci_policy.v1.contents_encryption_mode != - ci->ci_policy.v1.filenames_encryption_mode) { -fscrypt_warn (ci->ci_inode, -"Direct key mode not allowed with different contents and filenames modes" ); -return -EINVAL ; - } - dk =fscrypt_get_direct_key (ci, raw_master_key);if (IS_ERR (dk))return PTR_ERR (dk);
fs/crypto/policy.c +30 -0
@@ -29,6 +29,26 @@ bool fscrypt_policies_equal(const union fscrypt_policy *policy1,return !memcmp (policy1, policy2,fscrypt_policy_size (policy1)); } +static bool supported_direct_key_modes (const struct inode *inode, +u32 contents_mode,u32 filenames_mode) +{ +const struct fscrypt_mode *mode; + +if (contents_mode != filenames_mode) { +fscrypt_warn (inode, +"Direct key flag not allowed with different contents and filenames modes" ); +return false; + } + mode = &fscrypt_modes[contents_mode]; + + if (mode->ivsize < offsetofend(union fscrypt_iv, nonce)) { +fscrypt_warn (inode,"Direct key flag not allowed with %s" , + mode->friendly_name); +return false; + } +return true; +} +static bool supported_iv_ino_lblk_64_policy (const struct fscrypt_policy_v2 *policy,const struct inode *inode)
@@ -82,6 +102,11 @@ static bool fscrypt_supported_v1_policy(const struct fscrypt_policy_v1 *policy,return false; } +if ((policy->flags &FSCRYPT_POLICY_FLAG_DIRECT_KEY ) && + !supported_direct_key_modes (inode, policy->contents_encryption_mode, + policy->filenames_encryption_mode)) +return false; +return true; }
@@ -103,6 +128,11 @@ static bool fscrypt_supported_v2_policy(const struct fscrypt_policy_v2 *policy,return false; } +if ((policy->flags &FSCRYPT_POLICY_FLAG_DIRECT_KEY ) && + !supported_direct_key_modes (inode, policy->contents_encryption_mode, + policy->filenames_encryption_mode)) +return false; +if ((policy->flags &FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 ) && !supported_iv_ino_lblk_64_policy (policy, inode))return false;
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Eric Biggers
maintainerQuoted 15 lines · Eric Biggers
Make
FS_IOC_SET_ENCRYPTION_POLICYstart rejecting theDIRECT_KEYflag when it's incompatible with the selected encryption modes, instead of delaying this check until later when actually trying to set up the directory's key.Also make some related cleanups, such as splitting
fscrypt_supported_policy()into a separate function for each encryption policy version.Eric Biggers (4):
fscrypt: split upfscrypt_supported_policy()by policy version
fscrypt: check for appropriate use ofDIRECT_KEYflag earlier
fscrypt: movefscrypt_valid_enc_modes()topolicy.c
fscrypt: removefscrypt_is_direct_key_policy()
Quoted 9 lines
fs/crypto/fscrypt_private.h | 30 +------ fs/crypto/keysetup.c | 14 +--- fs/crypto/keysetup_v1.c | 15 ---- fs/crypto/policy.c | 163 +++++++++++++++++++++++------------- 4 files changed, 111 insertions(+), 111 deletions(-)Signature · 1 line
2.24.0.393.g34dc348eaf-goog
All applied to fscrypt.git#master for 5.6.
- Eric