| From 654adaa72cd4e112d39d35a04229f8f4f8762fec Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Thu, 24 Nov 2016 14:05:44 +0300 |
| Subject: [PATCH] iommu/amd: Missing error code in amd_iommu_init_device() |
| |
| commit 24c790fbf5d8f54c8c82979db11edea8855b74bf upstream. |
| |
| We should set "ret" to -EINVAL if iommu_group_get() fails. |
| |
| Fixes: 55c99a4dc50f ("iommu/amd: Use iommu_attach_group()") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Joerg Roedel <jroedel@suse.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c |
| index 594849a3a9be..f8ed8c95b685 100644 |
| --- a/drivers/iommu/amd_iommu_v2.c |
| +++ b/drivers/iommu/amd_iommu_v2.c |
| @@ -805,8 +805,10 @@ int amd_iommu_init_device(struct pci_dev *pdev, int pasids) |
| goto out_free_domain; |
| |
| group = iommu_group_get(&pdev->dev); |
| - if (!group) |
| + if (!group) { |
| + ret = -EINVAL; |
| goto out_free_domain; |
| + } |
| |
| ret = iommu_attach_group(dev_state->domain, group); |
| if (ret != 0) |
| -- |
| 2.10.1 |
| |
