Linux FSCRYPT development
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: stable@vger.kernel.org
Cc: linux-hardening@vger.kernel.org, linux-fscrypt@vger.kernel.org,
	linux-kernel@vger.kernel.org, Eric Biggers <ebiggers@kernel.org>
Subject: [PATCH 6.12 0/7] Backport object allocation APIs and two fscrypt fixes
Date: Thu, 16 Jul 2026 21:42:56 -0700	[thread overview]
Message-ID: <20260717044303.425265-1-ebiggers@kernel.org> (raw)

Like I did in an earlier series for 6.18
(https://lore.kernel.org/linux-hardening/20260709043301.142931-1-ebiggers@kernel.org/),
this series backports kmalloc_obj() et al to 6.12 so that more upstream
commits will cherry-pick cleanly.  As in 6.18, the flex counter
integration isn't included.

Patches 6-7 then backport two fscrypt fixes (which, like lots of other
kernel code, happen to use kzalloc_obj()).  Patch 7 is a clean
cherry-pick, while patch 6 required resolving some other conflicts.

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

Kees Cook (2):
  slab: Introduce kmalloc_obj() and family
  slab: Introduce kmalloc_flex() and family

Linus Torvalds (2):
  add default_gfp() helper macro and use it in the new *alloc_obj()
    helpers
  default_gfp(): avoid using the "newfangled" __VA_OPT__ trick

Randy Dunlap (1):
  slab: recognize @GFP parameter as optional in kernel-doc

 Documentation/process/deprecated.rst |  31 ++++
 fs/crypto/fscrypt_private.h          |  87 ++++++----
 fs/crypto/inline_crypt.c             |   8 +-
 fs/crypto/keyring.c                  | 239 ++++++++++++---------------
 fs/crypto/keysetup.c                 | 119 ++++++++-----
 include/linux/gfp.h                  |   4 +
 include/linux/slab.h                 | 100 +++++++++++
 7 files changed, 373 insertions(+), 215 deletions(-)


base-commit: 296aabce459470a4c1b68ffd0c0c0920e563aaad
-- 
2.55.0


             reply	other threads:[~2026-07-17  4:46 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-17  4:42 Eric Biggers [this message]
2026-07-17  4:42 ` [PATCH 6.12 1/7] slab: Introduce kmalloc_obj() and family Eric Biggers
2026-07-17  4:42 ` [PATCH 6.12 2/7] slab: Introduce kmalloc_flex() " Eric Biggers
2026-07-17  4:42 ` [PATCH 6.12 3/7] add default_gfp() helper macro and use it in the new *alloc_obj() helpers Eric Biggers
2026-07-17  4:43 ` [PATCH 6.12 4/7] default_gfp(): avoid using the "newfangled" __VA_OPT__ trick Eric Biggers
2026-07-17  4:43 ` [PATCH 6.12 5/7] slab: recognize @GFP parameter as optional in kernel-doc Eric Biggers
2026-07-17  4:43 ` [PATCH 6.12 6/7] fscrypt: Fix key setup in edge case with multiple data unit sizes Eric Biggers
2026-07-17  4:43 ` [PATCH 6.12 7/7] fscrypt: Replace mk_users keyring with simple list Eric Biggers

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=20260717044303.425265-1-ebiggers@kernel.org \
    --to=ebiggers@kernel.org \
    --cc=linux-fscrypt@vger.kernel.org \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /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