crypto: arm64/aes-neonbs: transition to kmalloc_obj()
Subsystems (2)
PATCH 1/1 crypto: arm64/aes-neonbs: transition to kmalloc_obj()
Convert to type aware allocation as suggested in commit 2932ba8d9c99 ("slab: Introduce kmalloc_obj() and family")
---
I have a couple similar patches lined up but they could be automated or maybe the script is already made by Kees.
Kees can you make a script assisted commit (again)?
--- arch/arm64/crypto/aes-neonbs-glue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/crypto/aes-neonbs-glue.c +2 -2
@@ -66,7 +66,7 @@ static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key,struct crypto_aes_ctx *rk;int err; - rk =kmalloc (sizeof (*rk),GFP_KERNEL ); + rk =kmalloc_obj (*rk);if (!rk)return -ENOMEM ;
@@ -128,7 +128,7 @@ static int aesbs_cbc_ctr_setkey(struct crypto_skcipher *tfm, const u8 *in_key,struct crypto_aes_ctx *rk;int err; - rk =kmalloc (sizeof (*rk),GFP_KERNEL ); + rk =kmalloc_obj (*rk);if (!rk)return -ENOMEM ;
Signature · 1 line
2.54.0
Quoted 6 lines · Manuel Ebner
Convert to type aware allocation as suggested in commit
2932ba8d9c99("slab: Introducekmalloc_obj()and family")CC Kees Cook <[email protected]>Fixes 652a3017c485 ("crypto: arm64/aes-neonbs - Move key expansion off the stack")Signed-off-by Manuel Ebner <[email protected]>
Please don't use the Fixes tag for behavior-preserving conversions like this.
- Eric
Quoted 3 lines · Manuel Ebner
I have a couple similar patches lined up but they could be automated or maybe the script is already made by Kees.
Kees can you make a script assisted commit (again)?
This lead me down quite a long path to try to figure out why the existing Coccinelle script (scripts/coccinelle/api/kmalloc_objs.cocci) didn't catch these. The answer is the cleanup.h macros and poor interaction with Coccinelle. I think I've got a work-around built now, and I'll send a new tree-wide change to Linus before -rc2 gets cut.
Thanks for noticing these got missed!
-Kees
Signature · 1 line
Kees Cook
Quoted 5 lines · Kees Cook
Quoted 3 lines · Manuel Ebner
I have a couple similar patches lined up but they could be automated or maybe the script is already made by Kees.
Kees can you make a script assisted commit (again)?
Quoted 7 lines
This lead me down quite a long path to try to figure out why the existing Coccinelle script (
scripts/coccinelle/api/kmalloc_objs.cocci) didn't catch these. The answer is thecleanup.hmacros and poor interaction with Coccinelle. I think I've got a work-around built now, and I'll send a new tree-wide change to Linus before -rc2 gets cut.Thanks for noticing these got missed!
I think they got introduced after the big '+_obj' commit, this commit 652a3017c485 ("crypto: arm64/aes-neonbs - Move key expansion off the stack") is from Mar 6 2026.
I did git checkout this commit and run checkpatch.pl (from Mar 6) over the commit:
WARNING: Prefer kmalloc_obj over kmalloc with sizeof #37: FILE: arch/arm64/crypto/aes-neonbs-glue.c:82:
+ rk = kmalloc(sizeof(*rk), GFP_KERNEL);
So the recommended workflow should have caught this.
Thanks for handling this.
Manuel
Quoted 1 line
-Kees