From: Florian Vaussard <florian.vaussard@epfl.ch>
To: "Joerg Roedel" <joro@8bytes.org>,
"Tony Lindgren" <tony@atomide.com>,
"Benoît Cousson" <bcousson@baylibre.com>
Cc: Rob Herring <rob.herring@calxeda.com>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>, Rob Landley <rob@landley.net>,
Grant Likely <grant.likely@linaro.org>,
Hiroshi Doyu <hdoyu@nvidia.com>,
Florian Vaussard <florian.vaussard@epfl.ch>,
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: [PATCH 2/7] iommu/omap: omap_iommu_attach() should return ENODEV, not NULL
Date: Tue, 17 Dec 2013 13:53:33 +0100 [thread overview]
Message-ID: <1387284818-28739-3-git-send-email-florian.vaussard@epfl.ch> (raw)
In-Reply-To: <1387284818-28739-1-git-send-email-florian.vaussard@epfl.ch>
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 <florian.vaussard@epfl.ch>
---
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);
--
1.8.1.2
next prev parent reply other threads:[~2013-12-17 12:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 12:53 [PATCH 0/7] Fix omap-iommu probe and convert to DT for 3.14 Florian Vaussard
2013-12-17 12:53 ` [PATCH 1/7] iommu/omap: Do bus_set_iommu() only if probe() succeeds Florian Vaussard
[not found] ` <1387284818-28739-2-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2013-12-23 19:02 ` Anna, Suman
[not found] ` <52B888C2.8040303-l0cyMroinI0@public.gmane.org>
2013-12-23 21:07 ` Florian Vaussard
[not found] ` <52B8A5F8.3000706-p8DiymsW2f8@public.gmane.org>
2013-12-23 23:35 ` Anna, Suman
[not found] ` <52B8C8C1.8080101-l0cyMroinI0@public.gmane.org>
2014-01-15 17:12 ` Florian Vaussard
2013-12-17 12:53 ` Florian Vaussard [this message]
[not found] ` <1387284818-28739-3-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2013-12-23 18:45 ` [PATCH 2/7] iommu/omap: omap_iommu_attach() should return ENODEV, not NULL Anna, Suman
2013-12-17 12:53 ` [PATCH 3/7] iommu/omap: Convert to devicetree Florian Vaussard
[not found] ` <1387284818-28739-4-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2013-12-23 19:48 ` Anna, Suman
[not found] ` <52B89394.5060902-l0cyMroinI0@public.gmane.org>
2013-12-23 21:17 ` Florian Vaussard
[not found] ` <52B8A87F.7080100-p8DiymsW2f8@public.gmane.org>
2013-12-23 23:42 ` Anna, Suman
2014-01-02 0:13 ` Laurent Pinchart
2014-01-02 1:01 ` Sebastian Reichel
[not found] ` <20140102010150.GA9933-SfvFxonMDyemK9LvCR3Hrw@public.gmane.org>
2014-01-15 17:16 ` Florian Vaussard
2013-12-17 12:53 ` [PATCH 4/7] iommu/omap: Allow enable/disable even without pdata Florian Vaussard
[not found] ` <1387284818-28739-5-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2013-12-23 19:05 ` Anna, Suman
[not found] ` <52B88990.5020807-l0cyMroinI0@public.gmane.org>
2013-12-23 21:19 ` Florian Vaussard
2013-12-17 12:53 ` [PATCH 5/7] ARM: dts: Complete data for isp iommu Florian Vaussard
[not found] ` <1387284818-28739-6-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2013-12-23 19:12 ` Anna, Suman
[not found] ` <52B88B1A.40506-l0cyMroinI0@public.gmane.org>
2013-12-23 21:34 ` Florian Vaussard
2013-12-24 0:10 ` Anna, Suman
2013-12-17 12:53 ` [PATCH 6/7] ARM: OMAP2+: Remove legacy data from hwmod for omap3 " Florian Vaussard
[not found] ` <1387284818-28739-7-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2013-12-23 19:08 ` Anna, Suman
[not found] ` <52B88A49.9020402-l0cyMroinI0@public.gmane.org>
2013-12-23 21:36 ` Florian Vaussard
[not found] ` <52B8ACED.1030209-p8DiymsW2f8@public.gmane.org>
2013-12-23 23:28 ` Anna, Suman
2013-12-17 12:53 ` [PATCH 7/7] ARM: OMAP2+: Remove platform-specific omap-iommu Florian Vaussard
[not found] ` <1387284818-28739-1-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2013-12-23 18:52 ` [PATCH 0/7] Fix omap-iommu probe and convert to DT for 3.14 Anna, Suman
[not found] ` <52B8866D.9060100-l0cyMroinI0@public.gmane.org>
2013-12-23 20:51 ` Florian Vaussard
[not found] ` <52B8A26A.3000905-p8DiymsW2f8@public.gmane.org>
2013-12-23 23:54 ` Anna, Suman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387284818-28739-3-git-send-email-florian.vaussard@epfl.ch \
--to=florian.vaussard@epfl.ch \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=hdoyu@nvidia.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).