drivers/macintosh: Add missing of_node_put in therm_adt746x.c
Subsystems (3)
PATCH 1/1 drivers/macintosh: Add missing of_node_put in therm_adt746x.c
of_node_put is needed before discarding a value received from of_find_node_by_name, eg in error handling code or when the device node is no longer used.
The semantic match that catches the bug is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression struct device_node *n;
position p1, p2;
struct device_node *n1;
statement S;
identifier f;
expression E;
expression *ptr != NULL;
@@
n@p1 = of_find_node_by_name(...)
...
if (!n) S
... when != of_node_put(n)
when != n1 = f(n,...)
when != E = n
when any
when strict(
return \(0\|<+...n...+>\|ptr\);
|
return@p2 ...;
|
of_node_put(n);
|
n1 = f(n,...)
|
E = n
)
@script:python@
p1 << r.p1;
p2 << r.p2;
@@
print "* file: %s of_find_node_by_name %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl>
--- drivers/macintosh/therm_adt746x.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/macintosh/therm_adt746x.c +4 -4
@@ -554,7 +554,7 @@ thermostat_init(void)const u32 *prop;int i =0 , offset =0 ;int err; - + np =of_find_node_by_name (NULL ,"fan" );if (!np)return -ENODEV ;
@@ -613,13 +613,13 @@ thermostat_init(void) } of_dev =of_platform_device_create (np,"temperatures" ,NULL ); - +of_node_put (np); +if (of_dev =NULL ) {printk (KERN_ERR "Can't register temperatures device !\n" ); -of_node_put (np);return -ENODEV ; } - + err =device_create_file (&of_dev->dev, &dev_attr_sensor1_temperature); err |=device_create_file (&of_dev->dev, &dev_attr_sensor2_temperature); err |=device_create_file (&of_dev->dev, &dev_attr_sensor1_limit);
Signature · 1 line
Nicolas Palix
Quoted 7 lines · On Tue, 2 Dec 2008 14:36:44 +0100 Nicolas Palix <[email protected]> wrote:
of_node_putis needed before discarding a value received fromof_find_node_by_name, eg in error handling code or when the device node is no longer used.Signed-off-by Nicolas Palix <[email protected]>Signed-off-by Julia Lawall <[email protected]>
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/