diff options
| author | Baoquan He <bhe@redhat.com> | 2017-08-24 21:13:57 +0800 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-08-28 11:28:37 +0200 |
| commit | ec62b1ab0f4ccbc48aa8b9852cc25b38a1f12d1e (patch) | |
| tree | 165e9d8cd543641d1dfe35622ead52adc39d6133 /drivers/iommu | |
| parent | 2479c631d16c53b01f897fe6a4666c04f71075fb (diff) | |
| download | op-kernel-dev-ec62b1ab0f4ccbc48aa8b9852cc25b38a1f12d1e.zip op-kernel-dev-ec62b1ab0f4ccbc48aa8b9852cc25b38a1f12d1e.tar.gz | |
iommu/amd: Check if domain is NULL in get_domain() and return -EBUSY
In get_domain(), 'domain' could be NULL before it's passed to dma_ops_domain()
to dereference. And the current code calling get_domain() can't deal with the
returned 'domain' well if its value is NULL.
So before dma_ops_domain() calling, check if 'domain' is NULL, If yes just return
ERR_PTR(-EBUSY) directly.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: df3f7a6e8e85 ('iommu/amd: Use is_attach_deferred call-back')
Signed-off-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 9e8ea19..b531307 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2472,6 +2472,9 @@ static struct protection_domain *get_domain(struct device *dev) domain = to_pdomain(io_domain); attach_device(dev, domain); } + if (domain == NULL) + return ERR_PTR(-EBUSY); + if (!dma_ops_domain(domain)) return ERR_PTR(-EBUSY); |
