Commit be43a5c8 authored Oct 19, 2022 by Jerry Snitselaar Committed by Lipeng Sang May 18, 2023

iommu/vt-d: Clean up si_domain in the init_dmars() error path

stable inclusion
from stable-v5.10.152
commit d74196bb278b8f8af88e16bd595997dfa3d6fdb0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I73HJ0

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d74196bb278b8f8af88e16bd595997dfa3d6fdb0



--------------------------------

[ Upstream commit 620bf9f9 ]

A splat from kmem_cache_destroy() was seen with a kernel prior to
commit ee2653bb ("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.

Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Will Deacon <will@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Fixes: 86080ccc ("iommu/vt-d: Allocate si_domain in init_dmars()")
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/20221010144842.308890-1-jsnitsel@redhat.com


Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Lipeng Sang <sanglipeng1@jd.com>

parent 421894cd

drivers/iommu/intel/iommu.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -2880,6 +2880,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;
		}

		@@ -3539,6 +3540,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;
		}

		kfree(g_iommus);