Commit 917b3c7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fix-v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull iommu fix from Joerg Roedel:

 - Fix potential memory leak in AMD IOMMU domain allocation path

* tag 'iommu-fix-v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Fix possible memory leak of 'domain'
parents 61dabacd 5b00369f

drivers/iommu/amd/iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -2078,10 +2078,6 @@ static struct protection_domain *protection_domain_alloc(unsigned int type) 
	int mode = DEFAULT_PGTABLE_LEVEL;

	int ret;



	domain = kzalloc(sizeof(*domain), GFP_KERNEL);

	if (!domain)

		return NULL;



	/*

	 * Force IOMMU v1 page table when iommu=pt and

	 * when allocating domain for pass-through devices.
@@ -2097,6 +2093,10 @@ static struct protection_domain *protection_domain_alloc(unsigned int type) 
		return NULL;

	}



	domain = kzalloc(sizeof(*domain), GFP_KERNEL);

	if (!domain)

		return NULL;



	switch (pgtable) {

	case AMD_IOMMU_V1:

		ret = protection_domain_init_v1(domain, mode);