Skip to content

fscrypt: improved logging and other cleanups

Eric Biggers linux-ext4 linux-f2fs-devel linux-fscrypt linux-mtd 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest15 patches 1 replyIn review
  2. v114 patches 0 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15fs, fscrypt: only define ->s_cop when FS_ENCRYPTION is enabledinclude/linux/fs.h+2 -20 replies
2/15fscrypt: clean up after fscrypt_prepare_lookup() conversionsfs/crypto/crypto.c fs/crypto/fscrypt_private.h include/linux/fscrypt_notsupp.h +1 more+1 -250 replies
3/15fscrypt: remove unnecessary NULL check when allocating skcipherfs/crypto/keyinfo.c+2 -20 replies
4/15fscrypt: remove error messages for skcipher_request_alloc() failurefs/crypto/crypto.c fs/crypto/fname.c+3 -130 replies
5/15fscrypt: remove stale comment from fscrypt_d_revalidate()fs/crypto/crypto.c+0 -10 replies
6/15fscrypt: don't clear flags on crypto transformfs/crypto/keyinfo.c+0 -10 replies
7/15fscrypt: don't special-case EOPNOTSUPP from fscrypt_get_encryption_info()fs/crypto/fname.c+1 -10 replies
8/15fscrypt: drop max_namelen check from fname_decrypt()fs/crypto/fname.c+2 -50 replies
9/15fscrypt: drop empty name check from fname_decrypt()fs/crypto/fname.c+0 -30 replies
10/15fscrypt: make fscrypt_operations.max_namelen an integerfs/crypto/fname.c fs/ext4/super.c fs/f2fs/super.c +2 more+5 -250 replies
11/15fscrypt: remove unnecessary check for non-logon key typefs/crypto/keyinfo.c+0 -60 replies
12/15fscrypt: remove internal key size constantsfs/crypto/fscrypt_private.h fs/crypto/keyinfo.c+7 -200 replies
13/15fscrypt: use a common logging functionfs/crypto/crypto.c fs/crypto/fname.c fs/crypto/fscrypt_private.h +2 more+57 -210 replies
14/15fscrypt: separate key lookup from key derivationfs/crypto/keyinfo.c+74 -480 replies
15/15fscrypt: only derive the needed portion of the keyfs/crypto/keyinfo.c+16 -230 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 00/15] fscrypt: improved logging and other cleanups

From: Eric Biggers <[email protected]>

Hello, here's yet another round of cleanups for fscrypt. Please consider for v4.18. These are all patches I've sent out previously. The series is based on v4.17-rc3.

Patches 1-12 mostly remove unnecessary or redundant code from a number of different places; nothing particularly noteworthy. Note: to avoid a merge conflict with f2fs/dev, I've dropped the patch "fscrypt: remove WARN_ON_ONCE() when decryption fails".

Patch 13 switches the existing warning and error messages in fscrypt over to use a common logging function, which is ratelimited and includes the filesystem name (->s_id) when available as well as a consistent prefix of "fscrypt:".

Patches 14-15 are optimizations and cleanups for key lookup and key derivation. They are extracted from the patch "fscrypt: refactor finding and deriving key" I had originally sent as part of the series "fscrypt: filesystem-level keyring and v2 policy support". But I think they're useful changes by themselves, so no need to wait on them.

Eric Biggers (15):
fs, fscrypt: only define ->s_cop when FS_ENCRYPTION is enabled
fscrypt: clean up after fscrypt_prepare_lookup() conversions
fscrypt: remove unnecessary NULL check when allocating skcipher
fscrypt: remove error messages for skcipher_request_alloc() failure
fscrypt: remove stale comment from fscrypt_d_revalidate()
fscrypt: don't clear flags on crypto transform
fscrypt: don't special-case EOPNOTSUPP from
fscrypt_get_encryption_info()
fscrypt: drop max_namelen check from fname_decrypt()
fscrypt: drop empty name check from fname_decrypt()
fscrypt: make fscrypt_operations.max_namelen an integer
fscrypt: remove unnecessary check for non-logon key type
fscrypt: remove internal key size constants
fscrypt: use a common logging function
fscrypt: separate key lookup from key derivation
fscrypt: only derive the needed portion of the key

 fs/crypto/crypto.c              |  36 ++++--
 fs/crypto/fname.c               |  32 ++---
 fs/crypto/fscrypt_private.h     |  19 +--
 fs/crypto/hooks.c               |   5 +-
 fs/crypto/keyinfo.c             | 200 +++++++++++++++++---------------
 fs/ext4/super.c                 |   8 +-
 fs/f2fs/super.c                 |   8 +-
 fs/ubifs/crypto.c               |  10 +-
 include/linux/fs.h              |   4 +-
 include/linux/fscrypt_notsupp.h |  10 --
 include/linux/fscrypt_supp.h    |  16 +--
 11 files changed, 161 insertions(+), 187 deletions(-)
Signature · 6 lines
2.17.0.441.gb46fe60e1d-goog


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot