[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4E522AD0.7030907@bfs.de>
Date: Mon, 22 Aug 2011 12:09:20 +0200
From: walter harms <wharms@....de>
To: Julia Lawall <julia@...u.dk>
CC: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
kernel-janitors@...r.kernel.org, Paul Mackerras <paulus@...ba.org>,
Grant Likely <grant.likely@...retlab.ca>,
linuxppc-dev@...ts.ozlabs.org, linux-kernel@...r.kernel.org,
devicetree-discuss@...ts.ozlabs.org
Subject: Re: [PATCH 2/2] arch/powerpc/platforms/powermac/setup.c: add missing
of_node_put
Am 21.08.2011 18:10, schrieb Julia Lawall:
> From: Julia Lawall <julia@...u.dk>
>
> np is initialized to the result of calling a function that calls
> of_node_get, so of_node_put should be called before the pointer is dropped.
>
> The semantic match that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression e,e1,e2;
> @@
>
> * e = \(of_find_node_by_type\|of_find_node_by_name\)(...)
> ... when != of_node_put(e)
> when != true e == NULL
> when != e2 = e
> e = e1
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@...u.dk>
>
> ---
> arch/powerpc/platforms/powermac/setup.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
> index 96580b1..970ea1d 100644
> --- a/arch/powerpc/platforms/powermac/setup.c
> +++ b/arch/powerpc/platforms/powermac/setup.c
> @@ -494,11 +494,15 @@ static int __init pmac_declare_of_platform_devices(void)
> return -1;
>
> np = of_find_node_by_name(NULL, "valkyrie");
> - if (np)
> + if (np) {
> of_platform_device_create(np, "valkyrie", NULL);
> + of_node_put(np);
> + }
> np = of_find_node_by_name(NULL, "platinum");
> - if (np)
> + if (np) {
> of_platform_device_create(np, "platinum", NULL);
> + of_node_put(np);
> + }
> np = of_find_node_by_type(NULL, "smu");
> if (np) {
> of_platform_device_create(np, "smu", NULL);
>
hi,
it seems save to call of_node_put(np) with np==NULL, i assume the same is true
for of_platform_device_create().
so the code collapses to:
_test_node(char *name)
{
struct device_node *np;
np = of_find_node_by_name(NULL, name);
of_platform_device_create(np, name, NULL);
of_node_put(np);
return NULL?:0:1;
}
maybe there is already something like find_node() ?
re,
wh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists