Commit ab6c5069 authored Apr 04, 2016 by Joerg Roedel Committed by Greg Kroah-Hartman Apr 20, 2016

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



commit eebb8034a5be8c2177cbf07ca2ecd2ff8a058958 upstream.

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.

Fixes: 1228236d ('iommu: Move default domain allocation to iommu_group_get_for_dev()')
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ee8516a1

drivers/iommu/iommu.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -848,6 +848,7 @@ struct iommu_group iommu_group_get_for_dev(struct device dev)
		if (!group->default_domain) {
		group->default_domain = __iommu_domain_alloc(dev->bus,
		IOMMU_DOMAIN_DMA);
		if (!group->domain)
		group->domain = group->default_domain;
		}