Skip to content

Backport object allocation APIs and two fscrypt fixes

Eric Biggers linux-fscrypt linux-hardening lkml stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest7 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7slab: Introduce kmalloc_obj() and familyDocumentation/process/deprecated.rst include/linux/slab.h+82 -00 replies
2/7slab: Introduce kmalloc_flex() and familyDocumentation/process/deprecated.rst include/linux/slab.h+49 -00 replies
3/7add default_gfp() helper macro and use it in the new *alloc_obj() helpersinclude/linux/gfp.h include/linux/slab.h+28 -240 replies
4/7default_gfp(): avoid using the "newfangled" __VA_OPT__ trickinclude/linux/gfp.h+2 -20 replies
5/7slab: recognize @GFP parameter as optional in kernel-docinclude/linux/slab.h+3 -30 replies
6/7fscrypt: Fix key setup in edge case with multiple data unit sizesfs/crypto/fscrypt_private.h fs/crypto/inline_crypt.c fs/crypto/keyring.c +1 more+125 -800 replies
7/7fscrypt: Replace mk_users keyring with simple listfs/crypto/fscrypt_private.h fs/crypto/keyring.c+113 -1350 replies

Reviews trailers per patch

3 of 7 patches have a Reviewed-by or Acked-by.

PatchVlastimil BabkaRicardo RibaldaRichard FitzgeraldHarry Yoo (Oracle)
1/7A-b
2/7A-b
3/7
4/7Reported-and-tested-by Reported-and-tested-by
5/7A-b
6/7
7/7

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v1 thread

Cover letter [PATCH 6.12 0/7] Backport object allocation APIs and two fscrypt fixes

Like I did in an earlier series for 6.18
(https://lore.kernel.org/linux-hardening/[email protected]/),
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

Signature · 1 line
2.55.0