From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Anna, Suman" Subject: Re: [PATCH 2/7] iommu/omap: omap_iommu_attach() should return ENODEV, not NULL Date: Mon, 23 Dec 2013 12:45:26 -0600 Message-ID: <52B884C6.7030600@ti.com> References: <1387284818-28739-1-git-send-email-florian.vaussard@epfl.ch> <1387284818-28739-3-git-send-email-florian.vaussard@epfl.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1387284818-28739-3-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org> 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: Florian Vaussard , Joerg Roedel , Tony Lindgren , =?ISO-8859-1?Q?Beno=EEt_Cousson?= Cc: Mark Rutland , "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Pawel Moll , Ian Campbell , "linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Rob Herring , "iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org" , Rob Landley , Kumar Gala , Grant Likely , "linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" List-Id: iommu@lists.linux-foundation.org On 12/17/2013 06:53 AM, Florian Vaussard wrote: > 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. > > In such case, omap_iommu_attach() should return ENODEV, not NULL. > > Signed-off-by: Florian Vaussard Acked-by: Suman Anna > --- > drivers/iommu/omap-iommu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c > index ee83bcc..385bf5e 100644 > --- a/drivers/iommu/omap-iommu.c > +++ b/drivers/iommu/omap-iommu.c > @@ -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) > { > - int err = -ENOMEM; > + int err = -ENODEV; > struct device *dev; > struct omap_iommu *obj; > > @@ -871,7 +871,7 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd) > (void *)name, > device_match_by_alias); > if (!dev) > - return NULL; > + return ERR_PTR(err); > > obj = to_iommu(dev); > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: s-anna@ti.com (Anna, Suman) Date: Mon, 23 Dec 2013 12:45:26 -0600 Subject: [PATCH 2/7] iommu/omap: omap_iommu_attach() should return ENODEV, not NULL In-Reply-To: <1387284818-28739-3-git-send-email-florian.vaussard@epfl.ch> References: <1387284818-28739-1-git-send-email-florian.vaussard@epfl.ch> <1387284818-28739-3-git-send-email-florian.vaussard@epfl.ch> Message-ID: <52B884C6.7030600@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 12/17/2013 06:53 AM, Florian Vaussard wrote: > 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. > > In such case, omap_iommu_attach() should return ENODEV, not NULL. > > Signed-off-by: Florian Vaussard Acked-by: Suman Anna > --- > drivers/iommu/omap-iommu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c > index ee83bcc..385bf5e 100644 > --- a/drivers/iommu/omap-iommu.c > +++ b/drivers/iommu/omap-iommu.c > @@ -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) > { > - int err = -ENOMEM; > + int err = -ENODEV; > struct device *dev; > struct omap_iommu *obj; > > @@ -871,7 +871,7 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd) > (void *)name, > device_match_by_alias); > if (!dev) > - return NULL; > + return ERR_PTR(err); > > obj = to_iommu(dev); > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757863Ab3LWSqT (ORCPT ); Mon, 23 Dec 2013 13:46:19 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:56723 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753774Ab3LWSqQ (ORCPT ); Mon, 23 Dec 2013 13:46:16 -0500 Message-ID: <52B884C6.7030600@ti.com> Date: Mon, 23 Dec 2013 12:45:26 -0600 From: "Anna, Suman" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Florian Vaussard , Joerg Roedel , Tony Lindgren , =?ISO-8859-1?Q?Beno=EEt_Cousson?= CC: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Rob Landley , Grant Likely , Hiroshi Doyu , "iommu@lists.linux-foundation.org" , "devicetree@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-omap@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH 2/7] iommu/omap: omap_iommu_attach() should return ENODEV, not NULL References: <1387284818-28739-1-git-send-email-florian.vaussard@epfl.ch> <1387284818-28739-3-git-send-email-florian.vaussard@epfl.ch> In-Reply-To: <1387284818-28739-3-git-send-email-florian.vaussard@epfl.ch> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/17/2013 06:53 AM, Florian Vaussard wrote: > 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. > > In such case, omap_iommu_attach() should return ENODEV, not NULL. > > Signed-off-by: Florian Vaussard Acked-by: Suman Anna > --- > drivers/iommu/omap-iommu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c > index ee83bcc..385bf5e 100644 > --- a/drivers/iommu/omap-iommu.c > +++ b/drivers/iommu/omap-iommu.c > @@ -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) > { > - int err = -ENOMEM; > + int err = -ENODEV; > struct device *dev; > struct omap_iommu *obj; > > @@ -871,7 +871,7 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd) > (void *)name, > device_match_by_alias); > if (!dev) > - return NULL; > + return ERR_PTR(err); > > obj = to_iommu(dev); > >