fscrypt: Replace some variable-size memsets with fixed-size
Eric Biggers
maintainerPATCH 1/1 fscrypt: Replace some variable-size memsets with fixed-size
For zeroing IVs and raw keys, remove the misguided optimization of zeroing the actual size used (typically 16 and 64 bytes respectively) instead of the max size (32 and 64 bytes respectively). Using a compile-time constant size allows the compiler to specialize the memset for that size (typically by inlining a few 'mov' instructions), which is more important than zeroing a few extra bytes with these small sizes.
--- fs/crypto/crypto.c | 2 +- fs/crypto/keysetup.c | 4 ++-- fs/crypto/keysetup_v1.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
fs/crypto/crypto.c +1 -1
@@ -91,7 +91,7 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 index, {u8 flags =fscrypt_policy_flags (&ci->ci_policy); -memset (iv,0 , ci->ci_mode->ivsize); +memset (iv,0 ,sizeof (*iv));if (flags &FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 ) {WARN_ON_ONCE (index >U32_MAX );
fs/crypto/keysetup.c +2 -2
@@ -282,7 +282,7 @@ static int setup_per_mode_enc_key(struct fscrypt_inode_info *ci, hkdf_info, hkdf_infolen, raw_mode_key, mode->keysize); err =fscrypt_prepare_key (prep_key, raw_mode_key, ci); -memzero_explicit (raw_mode_key, mode->keysize); +memzero_explicit (raw_mode_key,sizeof (raw_mode_key)); }if (err) {kfree (new_node);
@@ -412,7 +412,7 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_inode_info *ci, ci->ci_nonce,FSCRYPT_FILE_NONCE_SIZE , derived_key, ci->ci_mode->keysize); err =fscrypt_set_per_file_enc_key (ci, derived_key); -memzero_explicit (derived_key, ci->ci_mode->keysize); +memzero_explicit (derived_key,sizeof (derived_key)); }if (err)return err;
fs/crypto/keysetup_v1.c +1 -1
@@ -245,7 +245,7 @@ static int setup_v1_file_key_derived(struct fscrypt_inode_info *ci, err =fscrypt_set_per_file_enc_key (ci, derived_key); -memzero_explicit (derived_key, derived_keysize); +memzero_explicit (derived_key,sizeof (derived_key));/* No need to zeroize 'aes', as its key is not secret. */ return err; }
base-commit: 2d0afaac9137e95e504bd3ad3512a9044745536b
Signature · 1 line
2.55.0
Quoted 7 lines · Eric Biggers
For zeroing IVs and raw keys, remove the misguided optimization of zeroing the actual size used (typically 16 and 64 bytes respectively) instead of the max size (32 and 64 bytes respectively). Using a compile-time constant size allows the compiler to specialize the memset for that size (typically by inlining a few 'mov' instructions), which is more important than zeroing a few extra bytes with these small sizes.
Quoted 6 lines
Signed-off-by Eric Biggers <[email protected]>--- fs/crypto/crypto.c | 2 +- fs/crypto/keysetup.c | 4 ++-- fs/crypto/keysetup_v1.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
Applied to https://git.kernel.org/pub/scm/fs/fscrypt/linux.git/log/?h=for-next
- Eric