From: Eric Biggers <ebiggers@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-fscrypt@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>,
Jaegeuk Kim <jaegeuk@kernel.org>,
Mohammed EL Kadiri <med08elkadiri@gmail.com>,
Luis Henriques <luis@igalia.com>,
syzbot+f55b043dacf43776b50c@syzkaller.appspotmail.com
Subject: [GIT PULL] fscrypt fixes for 7.2
Date: Fri, 26 Jun 2026 17:43:14 -0700 [thread overview]
Message-ID: <20260627004314.GA2075@quark> (raw)
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(-)
reply other threads:[~2026-06-27 0:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260627004314.GA2075@quark \
--to=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luis@igalia.com \
--cc=med08elkadiri@gmail.com \
--cc=syzbot+f55b043dacf43776b50c@syzkaller.appspotmail.com \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox