Commit 7ee08b9e authored by Suman Anna's avatar Suman Anna Committed by Joerg Roedel

iommu/omap: Fix error return paths in omap_iommu_attach()

There are couple of issues with the error return paths in
omap_iommu_attach():
1. omap_iommu_attach() returns NULL or ERR_PTR in case of error,
   but omap_iommu_attach_dev() only checks for IS_ERR. Thus a NULL
   return value (in case driver_find_device fails) will cause the
   kernel to panic when omap_iommu_attach_dev() dereferences the
   pointer.
2. A try_module_get() failure returns a valid success value as
   returned from iommu_enable().

Both the above issues have been fixed up to return the proper
ERR_PTR.
Signed-off-by: default avatarFlorian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
parent f129b3df
...@@ -863,7 +863,7 @@ static int device_match_by_alias(struct device *dev, void *data) ...@@ -863,7 +863,7 @@ static int device_match_by_alias(struct device *dev, void *data)
**/ **/
static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd) static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
{ {
int err = -ENOMEM; int err;
struct device *dev; struct device *dev;
struct omap_iommu *obj; struct omap_iommu *obj;
...@@ -871,7 +871,7 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd) ...@@ -871,7 +871,7 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
(void *)name, (void *)name,
device_match_by_alias); device_match_by_alias);
if (!dev) if (!dev)
return NULL; return ERR_PTR(-ENODEV);
obj = to_iommu(dev); obj = to_iommu(dev);
...@@ -890,8 +890,10 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd) ...@@ -890,8 +890,10 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
goto err_enable; goto err_enable;
flush_iotlb_all(obj); flush_iotlb_all(obj);
if (!try_module_get(obj->owner)) if (!try_module_get(obj->owner)) {
err = -ENODEV;
goto err_module; goto err_module;
}
spin_unlock(&obj->iommu_lock); spin_unlock(&obj->iommu_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment