From: Krzysztof Kozlowski <k.kozlowski@samsung.com> To: Kukjin Kim <kgene@kernel.org> Cc: "'Russell King'" <linux@arm.linux.org.uk>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: EXYNOS: Handle of of_iomap() failure Date: Tue, 03 Feb 2015 09:09:21 +0100 [thread overview] Message-ID: <1422950961.10086.2.camel@AMDC1943> (raw) In-Reply-To: <054001d03f60$58535150$08f9f3f0$@kernel.org> On wto, 2015-02-03 at 12:20 +0900, Kukjin Kim wrote: > Krzysztof Kozlowski wrote: > > > > Prevent possible NULL pointer dereference if of_iomap() fails. Handle > > the error by skipping such power domain. > > > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > > --- > > arch/arm/mach-exynos/pm_domains.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c > > index 20f267121b3e..fd7640a6b503 100644 > > --- a/arch/arm/mach-exynos/pm_domains.c > > +++ b/arch/arm/mach-exynos/pm_domains.c > > @@ -128,6 +128,13 @@ static __init int exynos4_pm_init_power_domain(void) > > pd->pd.name = kstrdup(np->name, GFP_KERNEL); > > pd->name = pd->pd.name; > > pd->base = of_iomap(np, 0); > > + if (!pd->base) { > > + dev_warn(&pdev->dev, "Failed to map memory\n"); > > + kfree(pd); > > + of_node_put(np); > > + continue; > > + } > > + > > pd->pd.power_off = exynos_pd_power_off; > > pd->pd.power_on = exynos_pd_power_on; > > > > -- > > Looks good and applied. Thanks! > BTW if we need more error handling like this, how about > error handling for failing of of_find_device_by_node() something like following? I'll take a look into this. Best regards, Krzysztof > > diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c > index 20f2671..234f967 100644 > --- a/arch/arm/mach-exynos/pm_domains.c > +++ b/arch/arm/mach-exynos/pm_domains.c > @@ -116,6 +116,10 @@ static __init int exynos4_pm_init_power_domain(void) > struct device *dev; > > pdev = of_find_device_by_node(np); > + if (!pdev) { > + /* error handling */ > + } > + > dev = &pdev->dev; > > pd = kzalloc(sizeof(*pd), GFP_KERNEL); > > I mean I'm not sure how many error/exception handling is required... > > Note you can see your patch in Samsung tree tonight in my time. > > Thanks, Kukjin
WARNING: multiple messages have this Message-ID (diff)
From: k.kozlowski@samsung.com (Krzysztof Kozlowski) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: EXYNOS: Handle of of_iomap() failure Date: Tue, 03 Feb 2015 09:09:21 +0100 [thread overview] Message-ID: <1422950961.10086.2.camel@AMDC1943> (raw) In-Reply-To: <054001d03f60$58535150$08f9f3f0$@kernel.org> On wto, 2015-02-03 at 12:20 +0900, Kukjin Kim wrote: > Krzysztof Kozlowski wrote: > > > > Prevent possible NULL pointer dereference if of_iomap() fails. Handle > > the error by skipping such power domain. > > > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > > --- > > arch/arm/mach-exynos/pm_domains.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c > > index 20f267121b3e..fd7640a6b503 100644 > > --- a/arch/arm/mach-exynos/pm_domains.c > > +++ b/arch/arm/mach-exynos/pm_domains.c > > @@ -128,6 +128,13 @@ static __init int exynos4_pm_init_power_domain(void) > > pd->pd.name = kstrdup(np->name, GFP_KERNEL); > > pd->name = pd->pd.name; > > pd->base = of_iomap(np, 0); > > + if (!pd->base) { > > + dev_warn(&pdev->dev, "Failed to map memory\n"); > > + kfree(pd); > > + of_node_put(np); > > + continue; > > + } > > + > > pd->pd.power_off = exynos_pd_power_off; > > pd->pd.power_on = exynos_pd_power_on; > > > > -- > > Looks good and applied. Thanks! > BTW if we need more error handling like this, how about > error handling for failing of of_find_device_by_node() something like following? I'll take a look into this. Best regards, Krzysztof > > diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c > index 20f2671..234f967 100644 > --- a/arch/arm/mach-exynos/pm_domains.c > +++ b/arch/arm/mach-exynos/pm_domains.c > @@ -116,6 +116,10 @@ static __init int exynos4_pm_init_power_domain(void) > struct device *dev; > > pdev = of_find_device_by_node(np); > + if (!pdev) { > + /* error handling */ > + } > + > dev = &pdev->dev; > > pd = kzalloc(sizeof(*pd), GFP_KERNEL); > > I mean I'm not sure how many error/exception handling is required... > > Note you can see your patch in Samsung tree tonight in my time. > > Thanks, Kukjin
next prev parent reply other threads:[~2015-02-03 8:09 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-12 15:37 [PATCH] ARM: EXYNOS: Handle of of_iomap() failure Krzysztof Kozlowski 2015-01-12 15:37 ` Krzysztof Kozlowski 2015-02-03 3:20 ` Kukjin Kim 2015-02-03 3:20 ` Kukjin Kim 2015-02-03 8:09 ` Krzysztof Kozlowski [this message] 2015-02-03 8:09 ` Krzysztof Kozlowski
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=1422950961.10086.2.camel@AMDC1943 \ --to=k.kozlowski@samsung.com \ --cc=kgene@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.