2008-06-09 12:21:35

by Julia Lawall

Subject: [PATCH 3/4] drivers/video/fsl-diu-fb.c: add missing of_node_put

From: Julia Lawall <[email protected]>

of_node_put is needed before discarding a value received from
of_find_node_by_type, eg in error handling code.

The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
struct device_node *n;
struct device_node *n1;
struct device_node *n2;
statement S;
identifier f1,f2;
expression E1,E2;
constant C;
@@

n = of_find_node_by_type(...)
...
if (!n) S
... when != of_node_put(n)
when != n1 = f1(n,...)
when != E1 = n
when any
when strict
(
+ of_node_put(n);
return -C;
|
of_node_put(n);
|
n2 = f2(n,...)
|
E2 = n
|
return ...;
)
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>

---

diff -u -p a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1664,8 +1664,10 @@ static int __init fsl_diu_init(void)
}

prop = of_get_property(np, "d-cache-size", NULL);
- if (prop == NULL)
+ if (prop == NULL) {
+ of_node_put(np);
return -ENODEV;
+ }

/* Freescale PLRU requires 13/8 times the cache size to do a proper
displacement flush
@@ -1674,8 +1676,10 @@ static int __init fsl_diu_init(void)
coherence_data_size /= 8;

prop = of_get_property(np, "d-cache-line-size", NULL);
- if (prop == NULL)
+ if (prop == NULL) {
+ of_node_put(np);
return -ENODEV;
+ }
d_cache_line_size = *prop;

of_node_put(np);

2008-06-09 18:04:20

by Krzysztof Helt

Subject: Re: [Linux-fbdev-devel] [PATCH 3/4] drivers/video/fsl-diu-fb.c: add missing of_node_put

On Mon, 9 Jun 2008 14:21:18 +0200 (CEST)
Julia Lawall <[email protected]> wrote:

> From: Julia Lawall <[email protected]>
>
> of_node_put is needed before discarding a value received from
> of_find_node_by_type, eg in error handling code.
>
(...)
>
> Signed-off-by: Julia Lawall <[email protected]>
>

Acked-by: Krzysztof Helt <[email protected]>

---------------------------------------------------------------
Sprawdz jak zdobyc zdrowy usmiech!
Kliknij >> http://link.interia.pl/f1e26