iommu/amd: Fix ivrs_base memleak in early_amd_iommu_init()

nizhen-t · joergroedel · commit 923b70581cb6 · 2025-09-05T15:11:07.000+02:00
Fix a permanent ACPI table memory leak in early_amd_iommu_init() when CMPXCHG16B feature is not supported Fixes: 82582f8 ("iommu/amd: Disable AMD IOMMU if CMPXCHG16B feature is not supported") Cc: stable@vger.kernel.org Signed-off-by: Zhen Ni <zhen.ni@easystack.cn> Reviewed-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Link: https://lore.kernel.org/r/20250822024915.673427-1-zhen.ni@easystack.cn Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
@@ -3067,7 +3067,8 @@ static int __init early_amd_iommu_init(void)
 
 	if (!boot_cpu_has(X86_FEATURE_CX16)) {
 		pr_err("Failed to initialize. The CMPXCHG16B feature is required.\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto out;
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -3067,7 +3067,8 @@ static int __init early_amd_iommu_init(void)`
`3067`	`3067`
`3068`	`3068`	`if (!boot_cpu_has(X86_FEATURE_CX16)) {`
`3069`	`3069`	`pr_err("Failed to initialize. The CMPXCHG16B feature is required.\n");`
`3070`		`- return -EINVAL;`
	`3070`	`+ ret = -EINVAL;`
	`3071`	`+ goto out;`
`3071`	`3072`	`}`
`3072`	`3073`
`3073`	`3074`	`/*`