* [PATCH v2] tpm: acpi: Fix memory leak at tpm_read_log_acpi() error path
@ 2026-11-09 17:37 Takashi Iwai
2026-11-09 18:42 ` Jarkko Sakkinen
2026-11-10 10:43 ` Paul Menzel
0 siblings, 2 replies; 4+ messages in thread
From: Takashi Iwai @ 2026-11-09 17:37 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: Peter Huewe, Jason Gunthorpe, linux-integrity, linux-kernel
When devm_add_action() returns an error, tpm_read_log_acpi() clears
log->bios_event_log unnecessarily to NULL before calling
tpm_bios_log_free(), and it would lead to a memory leak of the
allocated log buffer.
Fix it by simply jumping to the err.
Cc: <stable@vger.kernel.org>
Fixes: a3a860bc0fd6 ("tpm: Change to kvalloc() in eventlog/acpi.c")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
v1->v2: minor update of patch description and tags order
drivers/char/tpm/eventlog/acpi.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/char/tpm/eventlog/acpi.c b/drivers/char/tpm/eventlog/acpi.c
index cf02ec646f46..50770cafa835 100644
--- a/drivers/char/tpm/eventlog/acpi.c
+++ b/drivers/char/tpm/eventlog/acpi.c
@@ -167,10 +167,8 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
}
ret = devm_add_action(&chip->dev, tpm_bios_log_free, log->bios_event_log);
- if (ret) {
- log->bios_event_log = NULL;
+ if (ret)
goto err;
- }
return format;
--
2.53.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] tpm: acpi: Fix memory leak at tpm_read_log_acpi() error path
2026-11-09 17:37 [PATCH v2] tpm: acpi: Fix memory leak at tpm_read_log_acpi() error path Takashi Iwai
@ 2026-11-09 18:42 ` Jarkko Sakkinen
2026-11-10 10:43 ` Paul Menzel
1 sibling, 0 replies; 4+ messages in thread
From: Jarkko Sakkinen @ 2026-11-09 18:42 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Peter Huewe, Jason Gunthorpe, linux-integrity, linux-kernel
On Mon, Nov 09, 2026 at 06:37:52PM +0100, Takashi Iwai wrote:
> When devm_add_action() returns an error, tpm_read_log_acpi() clears
> log->bios_event_log unnecessarily to NULL before calling
> tpm_bios_log_free(), and it would lead to a memory leak of the
> allocated log buffer.
>
> Fix it by simply jumping to the err.
>
> Cc: <stable@vger.kernel.org>
> Fixes: a3a860bc0fd6 ("tpm: Change to kvalloc() in eventlog/acpi.c")
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> v1->v2: minor update of patch description and tags order
>
> drivers/char/tpm/eventlog/acpi.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/eventlog/acpi.c b/drivers/char/tpm/eventlog/acpi.c
> index cf02ec646f46..50770cafa835 100644
> --- a/drivers/char/tpm/eventlog/acpi.c
> +++ b/drivers/char/tpm/eventlog/acpi.c
> @@ -167,10 +167,8 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
> }
>
> ret = devm_add_action(&chip->dev, tpm_bios_log_free, log->bios_event_log);
> - if (ret) {
> - log->bios_event_log = NULL;
> + if (ret)
> goto err;
> - }
>
> return format;
>
> --
> 2.53.0
>
Thank you!
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Br, Jarkko
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] tpm: acpi: Fix memory leak at tpm_read_log_acpi() error path
2026-11-09 17:37 [PATCH v2] tpm: acpi: Fix memory leak at tpm_read_log_acpi() error path Takashi Iwai
2026-11-09 18:42 ` Jarkko Sakkinen
@ 2026-11-10 10:43 ` Paul Menzel
2026-11-10 12:56 ` Jarkko Sakkinen
1 sibling, 1 reply; 4+ messages in thread
From: Paul Menzel @ 2026-11-10 10:43 UTC (permalink / raw)
To: Takashi Iwai
Cc: Jarkko Sakkinen, Peter Huewe, Jason Gunthorpe, linux-integrity,
linux-kernel
Dear Takashi,
Thank you for your patch.
Am 09.11.26 um 18:37 schrieb Takashi Iwai:
> When devm_add_action() returns an error, tpm_read_log_acpi() clears
> log->bios_event_log unnecessarily to NULL before calling
> tpm_bios_log_free(), and it would lead to a memory leak of the
> allocated log buffer.
>
> Fix it by simply jumping to the err.
>
> Cc: <stable@vger.kernel.org>
> Fixes: a3a860bc0fd6 ("tpm: Change to kvalloc() in eventlog/acpi.c")
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> v1->v2: minor update of patch description and tags order
>
> drivers/char/tpm/eventlog/acpi.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/eventlog/acpi.c b/drivers/char/tpm/eventlog/acpi.c
> index cf02ec646f46..50770cafa835 100644
> --- a/drivers/char/tpm/eventlog/acpi.c
> +++ b/drivers/char/tpm/eventlog/acpi.c
> @@ -167,10 +167,8 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
> }
>
> ret = devm_add_action(&chip->dev, tpm_bios_log_free, log->bios_event_log);
> - if (ret) {
> - log->bios_event_log = NULL;
> + if (ret)
> goto err;
> - }
>
> return format;
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Kind regards,
Paul
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] tpm: acpi: Fix memory leak at tpm_read_log_acpi() error path
2026-11-10 10:43 ` Paul Menzel
@ 2026-11-10 12:56 ` Jarkko Sakkinen
0 siblings, 0 replies; 4+ messages in thread
From: Jarkko Sakkinen @ 2026-11-10 12:56 UTC (permalink / raw)
To: Paul Menzel
Cc: Takashi Iwai, Peter Huewe, Jason Gunthorpe, linux-integrity,
linux-kernel
On Tue, Nov 10, 2026 at 11:43:31AM +0100, Paul Menzel wrote:
> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Thanks, I added it:
https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git/log/?h=for-next-keys
Br, Jarkko
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-11-10 12:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-09 17:37 [PATCH v2] tpm: acpi: Fix memory leak at tpm_read_log_acpi() error path Takashi Iwai
2026-11-09 18:42 ` Jarkko Sakkinen
2026-11-10 10:43 ` Paul Menzel
2026-11-10 12:56 ` Jarkko Sakkinen
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®