iommu/vt-d: Clean up si_domain in the init_dmars() error path
Subsystems (2)
PATCH 1/1 iommu/vt-d: Clean up si_domain in the init_dmars() error path
A splat from kmem_cache_destroy() was seen with a kernel prior to commit ee2653bbe89d ("iommu/vt-d: Remove domain and devinfo mempool") when there was a failure in init_dmars(), because the iommu_domain cache still had objects. While the mempool code is now gone, there still is a leak of the si_domain memory if init_dmars() fails. So clean up si_domain in the init_dmars() error path.
--- drivers/iommu/intel/iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/intel/iommu.c +2 -0
@@ -3042,6 +3042,8 @@ static int __init init_dmars(void)disable_dmar_iommu (iommu);free_dmar_iommu (iommu); } +if (si_domain) +domain_exit (si_domain);return ret; }
Signature · 1 line
2.37.2
Baolu Lu
maintainerQuoted 22 lines · Jerry Snitselaar
A splat from
kmem_cache_destroy()was seen with a kernel prior to commitee2653bbe89d("iommu/vt-d: Remove domain and devinfo mempool") when there was a failure ininit_dmars(), because theiommu_domaincache still had objects. While the mempool code is now gone, there still is a leak of thesi_domainmemory ifinit_dmars()fails. So clean upsi_domainin theinit_dmars()error path.Cc Lu Baolu <[email protected]>Cc Joerg Roedel <[email protected]>Cc Will Deacon <[email protected]>Cc Robin Murphy <[email protected]>Fixes 86080ccc223a ("iommu/vt-d: Allocate si_domain in init_dmars()")Signed-off-by Jerry Snitselaar <[email protected]>--- drivers/iommu/intel/iommu.c | 2 ++ 1 file changed, 2 insertions(+)drivers/iommu/intel/iommu.c +0
-0
drivers/iommu/intel/iommu.c static int __init init_dmars(void) · line 3046
Quoted 5 lines
drivers/iommu/intel/iommu.c +2
-0@@ -3042,6 +3042,8 @@ static int __init init_dmars(void)disable_dmar_iommu (iommu);free_dmar_iommu (iommu); } +if (si_domain) +domain_exit (si_domain);
Thank you for the patch.
Above requires si_domain to be NULL or a valid pointer. So do you also need to add the following change?
drivers/iommu/intel/iommu.c +1 -0
@@ -2410,6 +2410,7 @@ static int __init si_domain_init(int hw)if (md_domain_init (si_domain,DEFAULT_DOMAIN_ADDRESS_WIDTH )) {domain_exit (si_domain); + si_domain =NULL ;return -EFAULT ; }
Best regards,
baolu
Quoted 44 lines · Baolu Lu
Quoted 22 lines · Jerry Snitselaar
A splat from
kmem_cache_destroy()was seen with a kernel prior to commitee2653bbe89d("iommu/vt-d: Remove domain and devinfo mempool") when there was a failure ininit_dmars(), because theiommu_domaincache still had objects. While the mempool code is now gone, there still is a leak of thesi_domainmemory ifinit_dmars()fails. So clean upsi_domainin theinit_dmars()error path.Cc Lu Baolu <[email protected]>Cc Joerg Roedel <[email protected]>Cc Will Deacon <[email protected]>Cc Robin Murphy <[email protected]>Fixes 86080ccc223a ("iommu/vt-d: Allocate si_domain in init_dmars()")Signed-off-by Jerry Snitselaar <[email protected]>--- drivers/iommu/intel/iommu.c | 2 ++ 1 file changed, 2 insertions(+)drivers/iommu/intel/iommu.c +0
-0drivers/iommu/intel/iommu.c static int __init init_dmars(void) · line 3046
Quoted 5 lines
drivers/iommu/intel/iommu.c +2
-0@@ -3042,6 +3042,8 @@ static int __init init_dmars(void)disable_dmar_iommu (iommu);free_dmar_iommu (iommu); } +if (si_domain) +domain_exit (si_domain);Thank you for the patch.
Above requires
si_domainto be NULL or a valid pointer. So do you also need to add the following change?drivers/iommu/intel/iommu.c +1
-0@@ -2410,6 +2410,7 @@ static int __init si_domain_init(int hw)if (md_domain_init (si_domain,DEFAULT_DOMAIN_ADDRESS_WIDTH )) {domain_exit (si_domain); + si_domain =NULL ;return -EFAULT ; }
Quoted 2 lines
Best regards,
baolu
Hi Baolu,
Yes. I think should add it after the domain_exit() call I added as well.
Regards,
Jerry
PATCH v2 1/1 iommu/vt-d: Clean up si_domain in the init_dmars() error path
In reply to Jerry SnitselaarA splat from kmem_cache_destroy() was seen with a kernel prior to commit ee2653bbe89d ("iommu/vt-d: Remove domain and devinfo mempool") when there was a failure in init_dmars(), because the iommu_domain cache still had objects. While the mempool code is now gone, there still is a leak of the si_domain memory if init_dmars() fails. So clean up si_domain in the init_dmars() error path.
---
v2: Set si_domain to NULL after the memory it points to has been freed.
drivers/iommu/intel/iommu.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/iommu/intel/iommu.c +5 -0
@@ -2400,6 +2400,7 @@ static int __init si_domain_init(int hw)if (md_domain_init (si_domain,DEFAULT_DOMAIN_ADDRESS_WIDTH )) {domain_exit (si_domain); + si_domain =NULL ;return -EFAULT ; }
@@ -3042,6 +3043,10 @@ static int __init init_dmars(void)disable_dmar_iommu (iommu);free_dmar_iommu (iommu); } +if (si_domain) { +domain_exit (si_domain); + si_domain =NULL ; + }return ret; }
Signature · 1 line
2.37.2
Baolu Lu
maintainerQuoted 7 lines · Jerry Snitselaar
A splat from
kmem_cache_destroy()was seen with a kernel prior to commitee2653bbe89d("iommu/vt-d: Remove domain and devinfo mempool") when there was a failure ininit_dmars(), because theiommu_domaincache still had objects. While the mempool code is now gone, there still is a leak of thesi_domainmemory ifinit_dmars()fails. So clean upsi_domainin theinit_dmars()error path.
Quoted 6 lines
Cc Lu Baolu<[email protected]>Cc Joerg Roedel<[email protected]>Cc Will Deacon<[email protected]>Cc Robin Murphy<[email protected]>Fixes 86080ccc223a ("iommu/vt-d: Allocate si_domain in init_dmars()")Signed-off-by Jerry Snitselaar<[email protected]>
Thanks for the patch. It has been queued for v6.1.
https://lore.kernel.org/linux-iommu/[email protected]/
Best regards,
baolu