]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
iommu/amd: Missing error code in amd_iommu_init_device()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 24 Nov 2016 11:05:44 +0000 (14:05 +0300)
committerLuis Henriques <luis.henriques@canonical.com>
Fri, 20 Jan 2017 11:26:54 +0000 (11:26 +0000)
BugLink: http://bugs.launchpad.net/bugs/1655969
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/iommu/amd_iommu_v2.c

index 7caf2fa237f22bd7a3b0932c6387ed52e0b26424..4831eb910fc743b71cd1fc4e11a1c5732f989cdd 100644 (file)
@@ -809,8 +809,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)