mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ella Ma <alansnape3058@gmail.com>
To: thomas.lendacky@amd.com, john.allen@amd.com,
	herbert@gondor.apana.org.au, davem@davemloft.net, arnd@arndb.de
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	julia.lawall@inria.fr, Markus.Elfring@web.de,
	Ella Ma <alansnape3058@gmail.com>,
	Tom Lendacky <thomas.lendacky@gmail.com>
Subject: [PATCH v2] crypto: ccp - Fix a crash due to incorrect cleanup usage of kfree
Date: Fri,  9 Jan 2026 16:17:24 +0100	[thread overview]
Message-ID: <20260109151724.58799-1-alansnape3058@gmail.com> (raw)
In-Reply-To: <20260108152906.56497-1-alansnape3058@gmail.com>

Annotating a local pointer variable, which will be assigned with the
kmalloc-family functions, with the `__cleanup(kfree)` attribute will
make the address of the local variable, rather than the address returned
by kmalloc, passed to kfree directly and lead to a crash due to invalid
deallocation of stack address. According to other places in the repo,
the correct usage should be `__free(kfree)`. The code coincidentally
compiled because the parameter type `void *` of kfree is compatible with
the desired type `struct { ... } **`.

Fixes: a71475582ada ("crypto: ccp - reduce stack usage in ccp_run_aes_gcm_cmd")
Signed-off-by: Ella Ma <alansnape3058@gmail.com>
Acked-by: Tom Lendacky <thomas.lendacky@gmail.com>
---

Changes in v2:
- Update the subject prefix as suggested by Markus


I don't have the machine to actually test the changed place. So I tried
locally with a simple test module. The crash happens right when the
module is being loaded.

```C
#include <linux/init.h>
#include <linux/module.h>
MODULE_LICENSE("GPL");
static int __init custom_init(void) {
  printk(KERN_INFO "Crash reproduce for drivers/crypto/ccp/ccp-ops.c");
  int *p __cleanup(kfree) = kzalloc(sizeof(int), GFP_KERNEL);
  *p = 42;
  return 0;
}
static void __exit custom_exit(void) {}
module_init(custom_init);
module_exit(custom_exit);
```

BESIDES, scripts/checkpatch.pl reports a coding style issue originally
existing in the code, `sizeof *wa`, I fixed this together in this patch.

 drivers/crypto/ccp/ccp-ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c
index d78865d9d5f0..f80a92006666 100644
--- a/drivers/crypto/ccp/ccp-ops.c
+++ b/drivers/crypto/ccp/ccp-ops.c
@@ -642,7 +642,7 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
 		struct ccp_data dst;
 		struct ccp_data aad;
 		struct ccp_op op;
-	} *wa __cleanup(kfree) = kzalloc(sizeof *wa, GFP_KERNEL);
+	} *wa __free(kfree) = kzalloc(sizeof(*wa), GFP_KERNEL);
 	unsigned int dm_offset;
 	unsigned int authsize;
 	unsigned int jobid;
-- 
2.34.1


  parent reply	other threads:[~2026-01-09 15:18 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-08 15:29 [PATCH] drivers/crypto/ccp/ccp-ops.c: " Ella Ma
2026-01-08 17:06 ` Markus Elfring
2026-01-08 20:12 ` Tom Lendacky
2026-01-09 15:17 ` Ella Ma [this message]
2026-01-31  2:48   ` [PATCH v2] crypto: ccp - " Herbert Xu
2026-01-31  6:33   ` Joe Perches

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=20260109151724.58799-1-alansnape3058@gmail.com \
    --to=alansnape3058@gmail.com \
    --cc=Markus.Elfring@web.de \
    --cc=arnd@arndb.de \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=john.allen@amd.com \
    --cc=julia.lawall@inria.fr \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=thomas.lendacky@amd.com \
    --cc=thomas.lendacky@gmail.com \
    /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

all inboxes | Powered by JetHome®