Commit b58f2140 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 75574f12 7cc31613
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define _ASM_IA64_DEVICE_H #define _ASM_IA64_DEVICE_H
struct dev_archdata { struct dev_archdata {
#ifdef CONFIG_INTEL_IOMMU #ifdef CONFIG_IOMMU_API
void *iommu; /* hook for IOMMU specific extension */ void *iommu; /* hook for IOMMU specific extension */
#endif #endif
}; };
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define _ASM_X86_DEVICE_H #define _ASM_X86_DEVICE_H
struct dev_archdata { struct dev_archdata {
#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU) #ifdef CONFIG_IOMMU_API
void *iommu; /* hook for IOMMU specific extension */ void *iommu; /* hook for IOMMU specific extension */
#endif #endif
}; };
......
...@@ -510,7 +510,7 @@ struct iommu_group *iommu_group_alloc(void) ...@@ -510,7 +510,7 @@ struct iommu_group *iommu_group_alloc(void)
NULL, "%d", group->id); NULL, "%d", group->id);
if (ret) { if (ret) {
ida_simple_remove(&iommu_group_ida, group->id); ida_simple_remove(&iommu_group_ida, group->id);
kfree(group); kobject_put(&group->kobj);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment