[GIT PULL] fscrypt fixes for 7.2

From: Eric Biggers

Date: Fri Jun 26 2026 - 20:43:34 EST


The following changes since commit 1dc18801be29bc54709aa355b8acd80e183b03cd:

Merge tag 'i2c-7.2-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux (2026-06-22 09:30:31 -0700)

are available in the Git repository at:

https://git.kernel.org/pub/scm/fs/fscrypt/linux.git tags/fscrypt-for-linus

for you to fetch changes up to 696c030e1e3438955aba443b308ee8b6faa3983e:

fscrypt: Replace mk_users keyring with simple list (2026-06-22 12:12:11 -0700)

----------------------------------------------------------------

- Fix a bug where in a specific edge case, file contents en/decryption
could be done with the wrong data unit size.

- Fix the data structure used for keeping track of users that have added
an fscrypt key to be a simple list instead of a 'struct key' keyring.

This fixes issues such as a lockdep report found by syzbot and
possible unintended interactions with the keyctl() system calls.

----------------------------------------------------------------
Eric Biggers (2):
fscrypt: Fix key setup in edge case with multiple data unit sizes
fscrypt: Replace mk_users keyring with simple list

fs/crypto/fscrypt_private.h | 84 ++++++++++------
fs/crypto/inline_crypt.c | 8 +-
fs/crypto/keyring.c | 239 +++++++++++++++++++-------------------------
fs/crypto/keysetup.c | 118 ++++++++++++++--------
4 files changed, 233 insertions(+), 216 deletions(-)