This is a note to let you know that I've just added the patch titled
tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tpm-tpm_tis-add-the-missed-acpi_put_table-to-fix-memory-leak.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From db9622f762104459ff87ecdf885cc42c18053fd9 Mon Sep 17 00:00:00 2001
From: Hanjun Guo <guohanjun@xxxxxxxxxx>
Date: Thu, 17 Nov 2022 19:23:42 +0800
Subject: tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak
From: Hanjun Guo <guohanjun@xxxxxxxxxx>
commit db9622f762104459ff87ecdf885cc42c18053fd9 upstream.
In check_acpi_tpm2(), we get the TPM2 table just to make
sure the table is there, not used after the init, so the
acpi_put_table() should be added to release the ACPI memory.
Fixes: 4cb586a188d4 ("tpm_tis: Consolidate the platform and acpi probe flow")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Hanjun Guo <guohanjun@xxxxxxxxxx>
Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/char/tpm/tpm_tis.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -129,6 +129,7 @@ static int check_acpi_tpm2(struct device
const struct acpi_device_id *aid = acpi_match_device(tpm_acpi_tbl, dev);
struct acpi_table_tpm2 *tbl;
acpi_status st;
+ int ret = 0;
if (!aid || aid->driver_data != DEVICE_IS_TPM2)
return 0;
@@ -136,8 +137,7 @@ static int check_acpi_tpm2(struct device
/* If the ACPI TPM2 signature is matched then a global ACPI_SIG_TPM2
* table is mandatory
*/
- st =
- acpi_get_table(ACPI_SIG_TPM2, 1, (struct acpi_table_header **)&tbl);
+ st = acpi_get_table(ACPI_SIG_TPM2, 1, (struct acpi_table_header **)&tbl);
if (ACPI_FAILURE(st) || tbl->header.length < sizeof(*tbl)) {
dev_err(dev, FW_BUG "failed to get TPM2 ACPI table\n");
return -EINVAL;
@@ -145,9 +145,10 @@ static int check_acpi_tpm2(struct device
/* The tpm2_crb driver handles this device */
if (tbl->start_method != ACPI_TPM2_MEMORY_MAPPED)
- return -ENODEV;
+ ret = -ENODEV;
- return 0;
+ acpi_put_table((struct acpi_table_header *)tbl);
+ return ret;
}
#else
static int check_acpi_tpm2(struct device *dev)
Patches currently in stable-queue which might be from guohanjun@xxxxxxxxxx are
queue-4.19/drm-radeon-add-the-missed-acpi_put_table-to-fix-memo.patch
queue-4.19/pnp-fix-name-memory-leak-in-pnp_alloc_dev.patch
queue-4.19/tpm-tpm_crb-add-the-missed-acpi_put_table-to-fix-memory-leak.patch
queue-4.19/tpm-tpm_tis-add-the-missed-acpi_put_table-to-fix-memory-leak.patch
queue-4.19/acct-fix-potential-integer-overflow-in-encode_comp_t.patch
