From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755927AbbBCDU2 (ORCPT ); Mon, 2 Feb 2015 22:20:28 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:57631 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751133AbbBCDUY (ORCPT ); Mon, 2 Feb 2015 22:20:24 -0500 X-AuditID: cbfee68f-f791c6d000004834-9d-54d03e760d67 From: Kukjin Kim To: "'Krzysztof Kozlowski'" , "'Russell King'" , "'Kukjin Kim'" , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org References: <1421077065-30175-1-git-send-email-k.kozlowski@samsung.com> In-reply-to: <1421077065-30175-1-git-send-email-k.kozlowski@samsung.com> Subject: RE: [PATCH] ARM: EXYNOS: Handle of of_iomap() failure Date: Tue, 03 Feb 2015 12:20:19 +0900 Message-id: <054001d03f60$58535150$08f9f3f0$@kernel.org> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AQJkKQ1kIdjWS6rbueU/x6XD/8TExJu2WWOg Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsWyRsSkQ7fM7kKIwa52TYvXLwwt+h+/ZrbY 9Pgaq8XlXXPYLGac38dkcfsyrwObR0tzD5vHplWdbB6bl9R79G1ZxejxeZNcAGsUl01Kak5m WWqRvl0CV8b/ZVvZC27yVhw7PJ+lgXEGdxcjJ4eEgInEu87XLBC2mMSFe+vZuhi5OIQEljJK XJ25ih2maMfX6VCJ6YwSH7dugXL+Mkr8mXoPqJ2Dg01AWaKxSR+kQVhAS2LhliYWkBoRgVeM Ek/XHAabJCTgLnH272wwm1PAQ2JCXyczRIOdRPu9zawgNouAqsTJFS+ZQGxeAQuJJf8OQNmC Ej8m3wM7lRlowfqdx5kgbHmJzWveMkNcqiCx4+xrRpB7RASMJP7fl4QoEZHY9+IdI8g9EgK3 2CV27jjEDLFLQOLb5ENg90sIyEpsOgA1RlLi4IobLBMYJWYh2TwLyeZZSDbPQrJiASPLKkbR 1ILkguKk9CJjveLE3OLSvHS95PzcTYzAeD3971n/Dsa7B6wPMQpwMCrx8M5QuRAixJpYVlyZ e4jRFOiiicxSosn5wKSQVxJvaGxmZGFqYmpsZG5ppiTOu1DqZ7CQQHpiSWp2ampBalF8UWlO avEhRiYOTqkGxiP7Pvi4pS7qDP8hUR/AXm/8KSv3muZLtZbIGC4x538m7KK94WK696ZttjX5 w8Jq0P/25o2mD9bLQ9/w6EorORhNXXOkbPbRL8l3PRpqOg69O3r0t0t5rKeEg8OlyWLsDHXr jmxNnt65YUZ9TNpZu/p4e7fkoKOfbqsmSp197SuhpGr7z3m1EktxRqKhFnNRcSIA6xOrA9IC AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42I5/e+xoG6Z3YUQg0nnVCxevzC06H/8mtli 0+NrrBaXd81hs5hxfh+Txe3LvA5sHi3NPWwem1Z1snlsXlLv0bdlFaPH501yAaxRDYw2GamJ KalFCql5yfkpmXnptkrewfHO8aZmBoa6hpYW5koKeYm5qbZKLj4Bum6ZOUD7lRTKEnNKgUIB icXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGEdYwZ/5dtZS+4yVtx7PB8lgbGGdxdjJwcEgIm Eju+TmeDsMUkLtxbD2RzcQgJTGeU+Lh1C5Tzl1Hiz9R7LF2MHBxsAsoSjU36IA3CAloSC7c0 sYDUiAi8YpR4uuYwO0hCSMBd4uzf2WA2p4CHxIS+TmaIBjuJ9nubWUFsFgFViZMrXjKB2LwC FhJL/h2AsgUlfkwG2cXJwQy0YP3O40wQtrzE5jVvmSEuVZDYcfY1I8g9IgJGEv/vS0KUiEjs e/GOcQKj0Cwkk2YhmTQLyaRZSFoWMLKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAhOBs+k djCubLA4xCjAwajEwztD5UKIEGtiWXFl7iFGCQ5mJRFevzPnQ4R4UxIrq1KL8uOLSnNSiw8x mgI9OpFZSjQ5H5io8kriDY1NzIwsjcwsjEzMzZXEeZXs20KEBNITS1KzU1MLUotg+pg4OKUa GA+lyN/Wnrb+jnRc2Ici9R3N/UevBHvZBXatfdGtnbz73lRP746nohLP9p7sXfz9E3eFKLtv usFVz577U69yeS1VWemlvFt7ncG6fSVRzF5X4yOklolsF+22YZ3uaaCt+uhar5Xfgfj0/VeM bsxal/Xk14PrNjomMTE7Pl/6WW+gMKH17R43fSWW4oxEQy3mouJEAGEJIWMcAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. BTW if we need more error handling like this, how about error handling for failing of of_find_device_by_node() something like following? 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: kgene@kernel.org (Kukjin Kim) Date: Tue, 03 Feb 2015 12:20:19 +0900 Subject: [PATCH] ARM: EXYNOS: Handle of of_iomap() failure In-Reply-To: <1421077065-30175-1-git-send-email-k.kozlowski@samsung.com> References: <1421077065-30175-1-git-send-email-k.kozlowski@samsung.com> Message-ID: <054001d03f60$58535150$08f9f3f0$@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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. BTW if we need more error handling like this, how about error handling for failing of of_find_device_by_node() something like following? 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