[PATCH 6.0 0/2] fscrypt fixes for stable

Please apply these to 6.0-stable.

Eric Biggers (2): fscrypt: stop using keyrings subsystem for fscrypt_master_key fscrypt: fix keyring memory leak on mount failure

fs/crypto/fscrypt_private.h | 71 ++++-- fs/crypto/hooks.c | 10 +- fs/crypto/keyring.c | 491 +++++++++++++++++++----------------- fs/crypto/keysetup.c | 81 +++--- fs/crypto/policy.c | 8 +- fs/super.c | 3 +- include/linux/fs.h | 2 +- include/linux/fscrypt.h | 4 +- 8 files changed, 359 insertions(+), 311 deletions(-)

base-commit: 3a2fa3c01fc7c2183eb3278bd912e5bcec20eb2a