From: kgene@kernel.org (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: EXYNOS: Fix dereference of ERR_PTR returned byof_genpd_get_from_provider
Date: Wed, 13 May 2015 17:44:55 +0900 [thread overview]
Message-ID: <55530F07.5080503@kernel.org> (raw)
In-Reply-To: <1431487072-17567-1-git-send-email-k.kozlowski@samsung.com>
On 05/13/15 12:17, Krzysztof Kozlowski wrote:
> ERR_PTR was dereferenced during sub domain parsing, if parent domain
> could not be obtained (because of invalid phandle or deferred
> registration of parent domain).
>
> The Exynos power domain code checked whether
> of_genpd_get_from_provider() returned NULL and in that case it skipped
> that power domain node. However this function returns ERR_PTR or valid
> pointer, not NULL.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: <stable@vger.kernel.org>
Maybe [4.0+]? but as you mentioned this patch has a dependency with
Patch "ARM: EXYNOS: Add missing of_node_put() when parsing power domain"
and it means this cannot be applied into stable tree...
So I'll apply this patch firstly then please re-submit them I've missed
before based on samsung tree. I think, it would be better...
> Fixes: 0f7807518fe1 ("ARM: EXYNOS: add support for sub-power domains")
>
> ---
>
> The patchset is rebased on top of my fixes for pm_domains.c to avoid the
> conflicts:
> https://lkml.org/lkml/2015/3/27/321
> ---
> arch/arm/mach-exynos/pm_domains.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
> index 1a90c5da2fd7..440324c94d28 100644
> --- a/arch/arm/mach-exynos/pm_domains.c
> +++ b/arch/arm/mach-exynos/pm_domains.c
> @@ -209,7 +209,7 @@ no_clk:
> args.np = np;
> args.args_count = 0;
> child_domain = of_genpd_get_from_provider(&args);
> - if (!child_domain)
> + if (IS_ERR(child_domain))
> goto next_pd;
>
> if (of_parse_phandle_with_args(np, "power-domains",
> @@ -217,7 +217,7 @@ no_clk:
> goto next_pd;
>
> parent_domain = of_genpd_get_from_provider(&args);
> - if (!parent_domain)
> + if (IS_ERR(parent_domain))
> goto next_pd;
>
> if (pm_genpd_add_subdomain(parent_domain, child_domain))
Applied into fixes with resolving conflict.
Thanks,
Kukjin
next prev parent reply other threads:[~2015-05-13 8:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-13 3:17 [PATCH] ARM: EXYNOS: Fix dereference of ERR_PTR returned by of_genpd_get_from_provider Krzysztof Kozlowski
2015-05-13 8:44 ` Kukjin Kim [this message]
2015-05-13 10:01 ` [PATCH] ARM: EXYNOS: Fix dereference of ERR_PTR returned byof_genpd_get_from_provider 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=55530F07.5080503@kernel.org \
--to=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).