Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1687892 > unrolled thread
| Started by | Julia Lawall <Julia.Lawall@lip6.fr> |
|---|---|
| First post | 2017-07-15 10:20 +0200 |
| Last post | 2017-07-15 11:20 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] leds: tlc591xx: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2017-07-15 10:20 +0200
Re: [PATCH] leds: tlc591xx: add missing of_node_put Pavel Machek <pavel@ucw.cz> - 2017-07-15 11:10 +0200
Re: [PATCH] leds: tlc591xx: add missing of_node_put Julia Lawall <julia.lawall@lip6.fr> - 2017-07-15 11:20 +0200
| From | Julia Lawall <Julia.Lawall@lip6.fr> |
|---|---|
| Date | 2017-07-15 10:20 +0200 |
| Subject | [PATCH] leds: tlc591xx: add missing of_node_put |
| Message-ID | <u3qsV-7uK-7@gated-at.bofh.it> |
for_each_child_of_node performs an of_node_get on each iteration, so a
return from the loop requires an of_node_put.
The semantic patch that fixes this problem is as follows
(http://coccinelle.lip6.fr):
// <smpl>
@@
local idexpression n;
expression e,e1;
iterator name for_each_child_of_node;
@@
for_each_child_of_node(e1,n) {
...
(
of_node_put(n);
|
e = n
|
return n;
|
+ of_node_put(n);
? return ...;
)
...
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
drivers/leds/leds-tlc591xx.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff -u -p a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
--- a/drivers/leds/leds-tlc591xx.c
+++ b/drivers/leds/leds-tlc591xx.c
@@ -230,12 +230,18 @@ tlc591xx_probe(struct i2c_client *client
for_each_child_of_node(np, child) {
err = of_property_read_u32(child, "reg", ®);
- if (err)
+ if (err) {
+ of_node_put(child);
return err;
- if (reg < 0 || reg >= tlc591xx->max_leds)
+ }
+ if (reg < 0 || reg >= tlc591xx->max_leds) {
+ of_node_put(child);
return -EINVAL;
- if (priv->leds[reg].active)
+ }
+ if (priv->leds[reg].active) {
+ of_node_put(child);
return -EINVAL;
+ }
priv->leds[reg].active = true;
priv->leds[reg].ldev.name =
of_get_property(child, "label", NULL) ? : child->name;
[toc] | [next] | [standalone]
| From | Pavel Machek <pavel@ucw.cz> |
|---|---|
| Date | 2017-07-15 11:10 +0200 |
| Message-ID | <u3rfk-7Zd-9@gated-at.bofh.it> |
| In reply to | #1687892 |
[Multipart message — attachments visible in raw view] — view raw
On Sat 2017-07-15 09:48:53, Julia Lawall wrote:
> for_each_child_of_node performs an of_node_get on each iteration, so a
> return from the loop requires an of_node_put.
>
> The semantic patch that fixes this problem is as follows
> (http://coccinelle.lip6.fr):
>
> // <smpl>
> @@
> local idexpression n;
> expression e,e1;
> iterator name for_each_child_of_node;
> @@
>
> for_each_child_of_node(e1,n) {
> ...
> (
> of_node_put(n);
> |
> e = n
> |
> return n;
> |
> + of_node_put(n);
> ? return ...;
> )
> ...
> }
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Pavel Machek <pavel@ucw.cz>
> @@ -230,12 +230,18 @@ tlc591xx_probe(struct i2c_client *client
>
> for_each_child_of_node(np, child) {
> err = of_property_read_u32(child, "reg", ®);
> - if (err)
> + if (err) {
> + of_node_put(child);
> return err;
> - if (reg < 0 || reg >= tlc591xx->max_leds)
> + }
> + if (reg < 0 || reg >= tlc591xx->max_leds) {
> + of_node_put(child);
> return -EINVAL;
> - if (priv->leds[reg].active)
> + }
> + if (priv->leds[reg].active) {
> + of_node_put(child);
> return -EINVAL;
> + }
I'd combine last two if()s into one...
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[toc] | [prev] | [next] | [standalone]
| From | Julia Lawall <julia.lawall@lip6.fr> |
|---|---|
| Date | 2017-07-15 11:20 +0200 |
| Message-ID | <u3roZ-82B-1@gated-at.bofh.it> |
| In reply to | #1687897 |
On Sat, 15 Jul 2017, Pavel Machek wrote:
> On Sat 2017-07-15 09:48:53, Julia Lawall wrote:
> > for_each_child_of_node performs an of_node_get on each iteration, so a
> > return from the loop requires an of_node_put.
> >
> > The semantic patch that fixes this problem is as follows
> > (http://coccinelle.lip6.fr):
> >
> > // <smpl>
> > @@
> > local idexpression n;
> > expression e,e1;
> > iterator name for_each_child_of_node;
> > @@
> >
> > for_each_child_of_node(e1,n) {
> > ...
> > (
> > of_node_put(n);
> > |
> > e = n
> > |
> > return n;
> > |
> > + of_node_put(n);
> > ? return ...;
> > )
> > ...
> > }
> > // </smpl>
> >
> > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Acked-by: Pavel Machek <pavel@ucw.cz>
>
> > @@ -230,12 +230,18 @@ tlc591xx_probe(struct i2c_client *client
> >
> > for_each_child_of_node(np, child) {
> > err = of_property_read_u32(child, "reg", ®);
> > - if (err)
> > + if (err) {
> > + of_node_put(child);
> > return err;
> > - if (reg < 0 || reg >= tlc591xx->max_leds)
> > + }
> > + if (reg < 0 || reg >= tlc591xx->max_leds) {
> > + of_node_put(child);
> > return -EINVAL;
> > - if (priv->leds[reg].active)
> > + }
> > + if (priv->leds[reg].active) {
> > + of_node_put(child);
> > return -EINVAL;
> > + }
>
> I'd combine last two if()s into one...
The test won't all fit on one line. Should I do it anyway?
julia
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web