2024-05-07 02:33:05

by Kun(llfl)

Subject: [PATCH 1/1] iommu/amd: Fix sysfs leak in iommu init

During the iommu initialization, iommu_init_pci() adds sysfs nodes.
However, these nodes aren't remove in free_iommu_resources() subsequently.

Fixes: ad8694bac410 ("iommu/amd: Move AMD IOMMU driver into subdirectory")
Signed-off-by: Kun(llfl) <[email protected]>
---
drivers/iommu/amd/init.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index ac6754a85f35..624ea2549f64 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -1678,8 +1678,15 @@ static void __init free_pci_segments(void)
}
}

+static void __init free_sysfs(struct amd_iommu *iommu)
+{
+ if (iommu->iommu.dev)
+ iommu_device_sysfs_remove(&iommu->iommu);
+}
+
static void __init free_iommu_one(struct amd_iommu *iommu)
{
+ free_sysfs(iommu);
free_cwwb_sem(iommu);
free_command_buffer(iommu);
free_event_buffer(iommu);
--
2.43.0

2024-05-07 09:12:35

by Suthikulpanit, Suravee

Subject: Re: [PATCH 1/1] iommu/amd: Fix sysfs leak in iommu init

Thanks for finding this sysfs leak.

On 5/7/2024 9:32 AM, Kun(llfl) wrote:
> During the iommu initialization, iommu_init_pci() adds sysfs nodes.
> However, these nodes aren't remove in free_iommu_resources() subsequently.
>
> Fixes: ad8694bac410 ("iommu/amd: Move AMD IOMMU driver into subdirectory")

Actually, this commit only move the code into new directory structure.
The original commit was:

commit 39ab9555c24110671f8dc671311a26e5c985b592
Author: Joerg Roedel <[email protected]>
Date: Wed Feb 1 16:56:46 2017 +0100

iommu: Add sysfs bindings for struct iommu_device

> Signed-off-by: Kun(llfl) <[email protected]>
> ---
> drivers/iommu/amd/init.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
> index ac6754a85f35..624ea2549f64 100644
> --- a/drivers/iommu/amd/init.c
> +++ b/drivers/iommu/amd/init.c
> @@ -1678,8 +1678,15 @@ static void __init free_pci_segments(void)
> }
> }
>
> +static void __init free_sysfs(struct amd_iommu *iommu)
> +{
> + if (iommu->iommu.dev)
> + iommu_device_sysfs_remove(&iommu->iommu);
> +}
> +
> static void __init free_iommu_one(struct amd_iommu *iommu)
> {
> + free_sysfs(iommu);

As part of the clean up, we also need to also call
iommu_device_unregister() before iommu_device_sysfs_remove().

Thanks,
Suravee

> free_cwwb_sem(iommu);
> free_command_buffer(iommu);
> free_event_buffer(iommu);