From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932478AbbBCIJ1 (ORCPT ); Tue, 3 Feb 2015 03:09:27 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:20802 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751753AbbBCIJZ (ORCPT ); Tue, 3 Feb 2015 03:09:25 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-c0-54d081a2f9bc Message-id: <1422950961.10086.2.camel@AMDC1943> Subject: Re: [PATCH] ARM: EXYNOS: Handle of of_iomap() failure From: Krzysztof Kozlowski To: Kukjin Kim Cc: "'Russell King'" , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 03 Feb 2015 09:09:21 +0100 In-reply-to: <054001d03f60$58535150$08f9f3f0$@kernel.org> References: <1421077065-30175-1-git-send-email-k.kozlowski@samsung.com> <054001d03f60$58535150$08f9f3f0$@kernel.org> Content-type: text/plain; charset=UTF-8 X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-version: 1.0 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJLMWRmVeSWpSXmKPExsVy+t/xa7qLGi+EGExczGTR//g1s8Wmx9dY LS7vmsNmMeP8PiaL25d5HVg9Wpp72Dw2repk89i8pN7j8ya5AJYoLpuU1JzMstQifbsEroyr FxILTvBX/LwS0cC4lqeLkZNDQsBEoq/1NCuELSZx4d56ti5GLg4hgaWMEi3X5jBDOJ8ZJSY+ /8EIUsUroC9xf1cXkM3BISxgJ7H9kzhImE3AWGLz8iVsIGERAUWJzQsUQFqZBaYxSrz52ccM UsMioCpx6sQyNhCbU8BSovnzGXYQW0igTOLzlAdgNcwC6hKT5i1iBpkjIaAs0djvBrFVUOLH 5HssECXyEpvXvGWewCgwC0nHLCRls5CULWBkXsUomlqaXFCclJ5rqFecmFtcmpeul5yfu4kR ErxfdjAuPmZ1iFGAg1GJh3eF0YUQIdbEsuLK3EOMEhzMSiK8uvlAId6UxMqq1KL8+KLSnNTi Q4xMHJxSDYy2HK4z3/Jufugqdf/fpfRTyrHSV6NuP3t5aMrvF9x5B+6rNfBVeCmYxH573bn7 B/uj//b+rHXz5HVSi2YznE3os7VrNe5WyZG/U3Rr3ispj/L6TX5LtNlrO48yHZFi+Lrg7sui WzPK1pV9ZLn9cbown/OHfz8/KJ3vX8LXfIQ9oDL4a2SNgosSS3FGoqEWc1FxIgCgJcG2PAIA AA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.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 > > --- > > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: k.kozlowski@samsung.com (Krzysztof Kozlowski) Date: Tue, 03 Feb 2015 09:09:21 +0100 Subject: [PATCH] ARM: EXYNOS: Handle of of_iomap() failure In-Reply-To: <054001d03f60$58535150$08f9f3f0$@kernel.org> References: <1421077065-30175-1-git-send-email-k.kozlowski@samsung.com> <054001d03f60$58535150$08f9f3f0$@kernel.org> Message-ID: <1422950961.10086.2.camel@AMDC1943> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.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 > > --- > > 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