Please apply these to 5.10-stable. Eric Biggers (3): fscrypt: simplify master key locking fscrypt: stop using keyrings subsystem for fscrypt_master_key fscrypt: fix keyring memory leak on mount failure fs/crypto/fscrypt_private.h | 80 ++++-- fs/crypto/hooks.c | 8 +- fs/crypto/keyring.c | 495 +++++++++++++++++++----------------- fs/crypto/keysetup.c | 85 +++---- fs/crypto/policy.c | 8 +- fs/super.c | 3 +- include/linux/fs.h | 2 +- include/linux/fscrypt.h | 4 +- 8 files changed, 360 insertions(+), 325 deletions(-) base-commit: 95aa34f72132ee42ee3f632a5540c84a5ee8624f -- 2.38.1
|