diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-04-04 15:47:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-20 15:45:25 +0900 |
| commit | dccfd02dae45e9a5afaff64f08975ab35fa82cec (patch) | |
| tree | c06b4c2803092d1e81bb96a518f889d02a092ab3 | |
| parent | 9b77d0df7362d4b109c452968711e18d7103ed81 (diff) | |
| download | lwn-dccfd02dae45e9a5afaff64f08975ab35fa82cec.tar.gz lwn-dccfd02dae45e9a5afaff64f08975ab35fa82cec.zip | |
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: 1228236de5f9 ('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>
| -rw-r--r-- | drivers/iommu/iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 0e3b0092ec92..515bb8b80952 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -848,7 +848,8 @@ 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); - group->domain = group->default_domain; + if (!group->domain) + group->domain = group->default_domain; } ret = iommu_group_add_device(group, dev); |