Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e027f3b9 authored by Hanjun Guo's avatar Hanjun Guo Committed by Greg Kroah-Hartman
Browse files

tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak 



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: 4cb586a1 ("tpm_tis: Consolidate the platform and acpi probe flow")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 927860df

drivers/char/tpm/tpm_tis.c

+5 −4
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ static int check_acpi_tpm2(struct device *dev) 
	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;
@@ -132,8 +133,7 @@ static int check_acpi_tpm2(struct device *dev) 
	/* 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;
@@ -141,9 +141,10 @@ static int check_acpi_tpm2(struct device *dev) 


	/* 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)