Skip to contentSkip to conversation

platform/x86/amd: hfi: Fix pcct_tbl leak in amd_hfi_metadata_parser()

PATCH In review Zhen Ni 3 participants 3 messages Aug 22, 2025 – Aug 25, 2025

Subsystems (3)
lore
Share & tools
lore

Zhen Ni

author
#0 lore raw

PATCH 1/1 platform/x86/amd: hfi: Fix pcct_tbl leak in amd_hfi_metadata_parser()

Fix a permanent ACPI table memory leak when amd_hfi_metadata_parser() fails due to invalid PCCT table length or memory allocation errors.

Fixes d4e95ea7a78e ("platform/x86: hfi: Parse CPU core ranking data from shared memory")
---
 drivers/platform/x86/amd/hfi/hfi.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/platform/x86/amd/hfi/hfi.c +10 -4
index 4f56149b3774..a465ac6f607e 100644
@@ -385,12 +385,16 @@ static int amd_hfi_metadata_parser(struct platform_device *pdev,
 	amd_hfi_data->pcct_entry = pcct_entry;
 	pcct_ext = (struct acpi_pcct_ext_pcc_slave *)pcct_entry;
 
-	if (pcct_ext->length <= 0)
-		return -EINVAL;
+	if (pcct_ext->length <= 0) {
+		ret = -EINVAL;
+		goto out;
+	}
 
 	amd_hfi_data->shmem = devm_kzalloc(amd_hfi_data->dev, pcct_ext->length, GFP_KERNEL);
-	if (!amd_hfi_data->shmem)
-		return -ENOMEM;
+	if (!amd_hfi_data->shmem) {
+		ret = -ENOMEM;
+		goto out;
+	}
 
 	pcc_chan->shmem_base_addr = pcct_ext->base_address;
 	pcc_chan->shmem_size = pcct_ext->length;
@@ -398,6 +402,8 @@ static int amd_hfi_metadata_parser(struct platform_device *pdev,
 	/* parse the shared memory info from the PCCT table */
 	ret = amd_hfi_fill_metadata(amd_hfi_data);
 
+out:
+	/* Don't leak any ACPI memory */
 	acpi_put_table(pcct_tbl);
 
 	return ret;
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Zhen Ni

Fix a permanent ACPI table memory leak when amd_hfi_metadata_parser() fails due to invalid PCCT table length or memory allocation errors.

Fixes d4e95ea7a78e ("platform/x86: hfi: Parse CPU core ranking data from shared memory")

Great catch, thanks.

Quoted 38 lines
---
  drivers/platform/x86/amd/hfi/hfi.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
drivers/platform/x86/amd/hfi/hfi.c +10 -4
index 4f56149b3774..a465ac6f607e 100644
@@ -385,12 +385,16 @@ static int amd_hfi_metadata_parser(struct platform_device *pdev,
  	amd_hfi_data->pcct_entry = pcct_entry;
  	pcct_ext = (struct acpi_pcct_ext_pcc_slave *)pcct_entry;
 
-	if (pcct_ext->length <= 0)
-		return -EINVAL;
+	if (pcct_ext->length <= 0) {
+		ret = -EINVAL;
+		goto out;
+	}
 
  	amd_hfi_data->shmem = devm_kzalloc(amd_hfi_data->dev, pcct_ext->length, GFP_KERNEL);
-	if (!amd_hfi_data->shmem)
-		return -ENOMEM;
+	if (!amd_hfi_data->shmem) {
+		ret = -ENOMEM;
+		goto out;
+	}
 
  	pcc_chan->shmem_base_addr = pcct_ext->base_address;
  	pcc_chan->shmem_size = pcct_ext->length;
@@ -398,6 +402,8 @@ static int amd_hfi_metadata_parser(struct platform_device *pdev,
  	/* parse the shared memory info from the PCCT table */
  	ret = amd_hfi_fill_metadata(amd_hfi_data);
 
+out:
+	/* Don't leak any ACPI memory */
  	acpi_put_table(pcct_tbl);
 
  	return ret;
maintainer
#2 lore raw
In reply to Zhen Ni
Quoted 4 lines · Zhen Ni

Fix a permanent ACPI table memory leak when amd_hfi_metadata_parser() fails due to invalid PCCT table length or memory allocation errors.

Thank you for your contribution, it has been applied to my local review-ilpo-fixes branch. Note it will show up in the public platform-drivers-x86/review-ilpo-fixes branch only once I've pushed my local branch there, which might take a while.

The list of commits applied:
[1/1] platform/x86/amd: hfi: Fix pcct_tbl leak in amd_hfi_metadata_parser()

      commit: d3a8ca2ebe6e3f2b1fb0e8e74f909d109a1d77c7

--
i.