Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers/hvc: Add missing of_node_put

of_node_put is needed before discarding a value received from
of_find_node_by_name, e.g., 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;
statement S1,S2;
expression E,E1;
expression *ptr != NULL;
@@

(
if (!(n@p1 = of_find_node_by_name(...))) S1
|
n@p1 = of_find_node_by_name(...)
)
<... when != of_node_put(n)
when != if (...) { <+... of_node_put(n) ...+> }
when != true !n || ...
when != n = E
when != E = n
if (!n || ...) S2
...>
(
return \(0\|<+...n...+>\|ptr\);
|
return@p2 ...;
|
n = E1
|
E1 = 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>

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

Nicolas Palix and committed by
Paul Mackerras
dc42149f b908b53d

+6 -2
+3 -1
drivers/char/hvc_iseries.c
··· 575 575 * of console adapters. 576 576 */ 577 577 if ((num_found >= MAX_NR_HVC_CONSOLES) || 578 - (num_found >= VTTY_PORTS)) 578 + (num_found >= VTTY_PORTS)) { 579 + of_node_put(vty); 579 580 break; 581 + } 580 582 581 583 vtermno = of_get_property(vty, "reg", NULL); 582 584 if (!vtermno)
+3 -1
drivers/char/hvc_vio.c
··· 153 153 /* We have statically defined space for only a certain number 154 154 * of console adapters. 155 155 */ 156 - if (num_found >= MAX_NR_HVC_CONSOLES) 156 + if (num_found >= MAX_NR_HVC_CONSOLES) { 157 + of_node_put(vty); 157 158 break; 159 + } 158 160 159 161 vtermno = of_get_property(vty, "reg", NULL); 160 162 if (!vtermno)