From mboxrd@z Thu Jan 1 00:00:00 1970 From: Suman Anna Subject: Re: [PATCH 1/2] iommu/omap: Check for valid archdata in attach_dev Date: Thu, 4 Sep 2014 14:37:44 -0500 Message-ID: <5408BF88.3050207@ti.com> References: <1409788712-10741-1-git-send-email-s-anna@ti.com> <1409788712-10741-2-git-send-email-s-anna@ti.com> <1593534.HBLyulJI44@avalon> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1593534.HBLyulJI44@avalon> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Laurent Pinchart Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Florian Vaussard List-Id: linux-omap@vger.kernel.org Hi Laurent, > On Wednesday 03 September 2014 18:58:31 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 non-NULL 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 >> --- >> drivers/iommu/omap-iommu.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c >> index 02ef0ac..f245d51 100644 >> --- a/drivers/iommu/omap-iommu.c >> +++ b/drivers/iommu/omap-iommu.c >> @@ -1092,6 +1092,12 @@ omap_iommu_attach_dev(struct iommu_domain *domain, >> struct device *dev) >> >> spin_lock(&omap_domain->lock); >> >> + if (!arch_data) { >> + dev_err(dev, "device doesn't have an associated iommu\n"); >> + ret = -EINVAL; >> + goto out; >> + } > > You can move this check outside of the spinlock-protected section. With that > change, Thanks, will fix this in the next revision, will also add the check for the name field. regards Suman > > Acked-by: Laurent Pinchart > >> + >> /* only a single device is supported per domain for now */ >> if (omap_domain->iommu_dev) { >> dev_err(dev, "iommu domain is already attached\n"); >