Commit eebb8034 authored by Joerg Roedel's avatar Joerg Roedel

iommu: Don't overwrite domain pointer when there is no default_domain

IOMMU drivers that do not support default domains, but make
use of the the group->domain pointer can get that pointer
overwritten with NULL on device add/remove.

Make sure this can't happen by only overwriting the domain
pointer when it is NULL.

Cc: stable@vger.kernel.org # v4.4+
Fixes: 1228236d ('iommu: Move default domain allocation to iommu_group_get_for_dev()')
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 07b48ac4
...@@ -848,7 +848,8 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) ...@@ -848,7 +848,8 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
if (!group->default_domain) { if (!group->default_domain) {
group->default_domain = __iommu_domain_alloc(dev->bus, group->default_domain = __iommu_domain_alloc(dev->bus,
IOMMU_DOMAIN_DMA); IOMMU_DOMAIN_DMA);
group->domain = group->default_domain; if (!group->domain)
group->domain = group->default_domain;
} }
ret = iommu_group_add_device(group, dev); ret = iommu_group_add_device(group, dev);
......
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