| Message ID | 1409869650-26115-2-git-send-email-s-anna@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Suman, Thank you for the patch. On Thursday 04 September 2014 17:27:29 Suman Anna wrote: > Any device requiring to be attached to an iommu_domain must have > valid archdata containing the necessary iommu information, which > is SoC-specific. Add a check in the omap_iommu_attach_dev to make > sure that the device has valid archdata before accessing > different SoC-specific fields of the archdata. This prevents a > NULL pointer dereference on any misconfigured devices. > > Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/iommu/omap-iommu.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c > index 02ef0ac..ea6e59d 100644 > --- a/drivers/iommu/omap-iommu.c > +++ b/drivers/iommu/omap-iommu.c > @@ -1090,6 +1090,11 @@ omap_iommu_attach_dev(struct iommu_domain *domain, > struct device *dev) struct omap_iommu_arch_data *arch_data = > dev->archdata.iommu; > int ret = 0; > > + if (!arch_data || !arch_data->name) { > + dev_err(dev, "device doesn't have an associated iommu\n"); > + return -EINVAL; > + } > + > spin_lock(&omap_domain->lock); > > /* only a single device is supported per domain for now */
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 02ef0ac..ea6e59d 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -1090,6 +1090,11 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) struct omap_iommu_arch_data *arch_data = dev->archdata.iommu; int ret = 0; + if (!arch_data || !arch_data->name) { + dev_err(dev, "device doesn't have an associated iommu\n"); + return -EINVAL; + } + spin_lock(&omap_domain->lock); /* only a single device is supported per domain for now */
Any device requiring to be attached to an iommu_domain must have valid archdata containing the necessary iommu information, which is SoC-specific. Add a check in the omap_iommu_attach_dev to make sure that the device has valid archdata before accessing different SoC-specific fields of the archdata. This prevents a NULL pointer dereference on any misconfigured devices. Signed-off-by: Suman Anna <s-anna@ti.com> --- drivers/iommu/omap-iommu.c | 5 +++++ 1 file changed, 5 insertions(+)