tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak
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: 4cb586a188
("tpm_tis: Consolidate the platform and acpi probe flow")
Cc: stable@vger.kernel.org
Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
This commit is contained in:
Родитель
37e90c374d
Коммит
db9622f762
|
@ -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);
|
const struct acpi_device_id *aid = acpi_match_device(tpm_acpi_tbl, dev);
|
||||||
struct acpi_table_tpm2 *tbl;
|
struct acpi_table_tpm2 *tbl;
|
||||||
acpi_status st;
|
acpi_status st;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
if (!aid || aid->driver_data != DEVICE_IS_TPM2)
|
if (!aid || aid->driver_data != DEVICE_IS_TPM2)
|
||||||
return 0;
|
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
|
/* If the ACPI TPM2 signature is matched then a global ACPI_SIG_TPM2
|
||||||
* table is mandatory
|
* table is mandatory
|
||||||
*/
|
*/
|
||||||
st =
|
st = acpi_get_table(ACPI_SIG_TPM2, 1, (struct acpi_table_header **)&tbl);
|
||||||
acpi_get_table(ACPI_SIG_TPM2, 1, (struct acpi_table_header **)&tbl);
|
|
||||||
if (ACPI_FAILURE(st) || tbl->header.length < sizeof(*tbl)) {
|
if (ACPI_FAILURE(st) || tbl->header.length < sizeof(*tbl)) {
|
||||||
dev_err(dev, FW_BUG "failed to get TPM2 ACPI table\n");
|
dev_err(dev, FW_BUG "failed to get TPM2 ACPI table\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -141,9 +141,10 @@ static int check_acpi_tpm2(struct device *dev)
|
||||||
|
|
||||||
/* The tpm2_crb driver handles this device */
|
/* The tpm2_crb driver handles this device */
|
||||||
if (tbl->start_method != ACPI_TPM2_MEMORY_MAPPED)
|
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
|
#else
|
||||||
static int check_acpi_tpm2(struct device *dev)
|
static int check_acpi_tpm2(struct device *dev)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче