diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 13:41:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 13:41:33 -0700 |
| commit | b58f2140ea8605ee6ea0530d9c0cb5d049f9c7ca (patch) | |
| tree | d7c0c445612e808801404c014b80a773ed4aaa4f | |
| parent | 75574f1212a7b4833367ad56626c30e64a94aa18 (diff) | |
| parent | 7cc31613734c4870ae32f5265d576ef296621343 (diff) | |
| download | spdx-b58f2140ea8605ee6ea0530d9c0cb5d049f9c7ca.tar.gz | |
Merge tag 'iommu-fixes-v5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
- Two build fixes for issues introduced during the merge window
- A fix for a reference count leak in an error path of
iommu_group_alloc()
* tag 'iommu-fixes-v5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu: Fix reference count leak in iommu_group_alloc.
x86: Hide the archdata.iommu field behind generic IOMMU_API
ia64: Hide the archdata.iommu field behind generic IOMMU_API
| -rw-r--r-- | arch/ia64/include/asm/device.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/device.h | 2 | ||||
| -rw-r--r-- | drivers/iommu/iommu.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/device.h b/arch/ia64/include/asm/device.h index 410a769ece9581..3eb39741538107 100644 --- a/arch/ia64/include/asm/device.h +++ b/arch/ia64/include/asm/device.h @@ -6,7 +6,7 @@ #define _ASM_IA64_DEVICE_H struct dev_archdata { -#ifdef CONFIG_INTEL_IOMMU +#ifdef CONFIG_IOMMU_API void *iommu; /* hook for IOMMU specific extension */ #endif }; diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h index 7e31f7f1bb062c..49bd6cf3eec919 100644 --- a/arch/x86/include/asm/device.h +++ b/arch/x86/include/asm/device.h @@ -3,7 +3,7 @@ #define _ASM_X86_DEVICE_H struct dev_archdata { -#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU) +#ifdef CONFIG_IOMMU_API void *iommu; /* hook for IOMMU specific extension */ #endif }; diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 1faa08c8bbb4dd..03d6a26687bc45 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -510,7 +510,7 @@ struct iommu_group *iommu_group_alloc(void) NULL, "%d", group->id); if (ret) { ida_simple_remove(&iommu_group_ida, group->id); - kfree(group); + kobject_put(&group->kobj); return ERR_PTR(ret); } |