* [PATCH] serial/sunsu: add missing of_node_put()
@ 2018-11-21 16:06 ` Yangtao Li
0 siblings, 0 replies; 4+ messages in thread
From: Yangtao Li @ 2018-11-21 16:06 UTC (permalink / raw)
To: davem, gregkh, jslaby; +Cc: sparclinux, linux-serial, linux-kernel, Yangtao Li
of_find_node_by_path() acquires a reference to the node
returned by it and that reference needs to be dropped by its caller.
This place is not doing this, so fix it.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
drivers/tty/serial/sunsu.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 6cf3e9b0728f..4a27c0114d50 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1394,22 +1394,32 @@ static inline struct console *SUNSU_CONSOLE(void)
static enum su_type su_get_type(struct device_node *dp)
{
struct device_node *ap = of_find_node_by_path("/aliases");
+ enum su_type rc = SU_PORT_PORT;
if (ap) {
+ struct device_node *tmp;
const char *keyb = of_get_property(ap, "keyboard", NULL);
const char *ms = of_get_property(ap, "mouse", NULL);
if (keyb) {
- if (dp == of_find_node_by_path(keyb))
- return SU_PORT_KBD;
+ tmp = of_find_node_by_path(keyb);
+ if (tmp && dp == tmp){
+ rc = SU_PORT_KBD;
+ goto out;
+ }
}
if (ms) {
- if (dp == of_find_node_by_path(ms))
- return SU_PORT_MS;
+ tmp = of_find_node_by_path(ms);
+ if (tmp && dp == tmp){
+ rc = SU_PORT_MS;
+ goto out;
+ }
}
}
- return SU_PORT_PORT;
+out:
+ of_node_put(ap);
+ return rc;
}
static int su_probe(struct platform_device *op)
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] serial/sunsu: add missing of_node_put()
@ 2018-11-21 16:06 ` Yangtao Li
0 siblings, 0 replies; 4+ messages in thread
From: Yangtao Li @ 2018-11-21 16:06 UTC (permalink / raw)
To: davem, gregkh, jslaby; +Cc: sparclinux, linux-serial, linux-kernel, Yangtao Li
of_find_node_by_path() acquires a reference to the node
returned by it and that reference needs to be dropped by its caller.
This place is not doing this, so fix it.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
drivers/tty/serial/sunsu.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 6cf3e9b0728f..4a27c0114d50 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1394,22 +1394,32 @@ static inline struct console *SUNSU_CONSOLE(void)
static enum su_type su_get_type(struct device_node *dp)
{
struct device_node *ap = of_find_node_by_path("/aliases");
+ enum su_type rc = SU_PORT_PORT;
if (ap) {
+ struct device_node *tmp;
const char *keyb = of_get_property(ap, "keyboard", NULL);
const char *ms = of_get_property(ap, "mouse", NULL);
if (keyb) {
- if (dp = of_find_node_by_path(keyb))
- return SU_PORT_KBD;
+ tmp = of_find_node_by_path(keyb);
+ if (tmp && dp = tmp){
+ rc = SU_PORT_KBD;
+ goto out;
+ }
}
if (ms) {
- if (dp = of_find_node_by_path(ms))
- return SU_PORT_MS;
+ tmp = of_find_node_by_path(ms);
+ if (tmp && dp = tmp){
+ rc = SU_PORT_MS;
+ goto out;
+ }
}
}
- return SU_PORT_PORT;
+out:
+ of_node_put(ap);
+ return rc;
}
static int su_probe(struct platform_device *op)
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] serial/sunsu: add missing of_node_put()
2018-11-21 16:06 ` Yangtao Li
@ 2018-12-03 4:57 ` David Miller
-1 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-12-03 4:57 UTC (permalink / raw)
To: tiny.windzz; +Cc: gregkh, jslaby, sparclinux, linux-serial, linux-kernel
From: Yangtao Li <tiny.windzz@gmail.com>
Date: Wed, 21 Nov 2018 11:06:15 -0500
> of_find_node_by_path() acquires a reference to the node
> returned by it and that reference needs to be dropped by its caller.
> This place is not doing this, so fix it.
>
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Several coding style problems and you are adding two new
leaks.
> + struct device_node *tmp;
> const char *keyb = of_get_property(ap, "keyboard", NULL);
> const char *ms = of_get_property(ap, "mouse", NULL);
Always order local variable declarations from longest to
shortest line.
>
> if (keyb) {
> - if (dp == of_find_node_by_path(keyb))
> - return SU_PORT_KBD;
> + tmp = of_find_node_by_path(keyb);
> + if (tmp && dp == tmp){
Always put a space between ")" and the "{" openning a new basic
block.
> + rc = SU_PORT_KBD;
> + goto out;
> + }
> }
> if (ms) {
> - if (dp == of_find_node_by_path(ms))
> - return SU_PORT_MS;
> + tmp = of_find_node_by_path(ms);
> + if (tmp && dp == tmp){
> + rc = SU_PORT_MS;
> + goto out;
> + }
> }
> }
>
> - return SU_PORT_PORT;
> +out:
> + of_node_put(ap);
> + return rc;
Now you have two references, one held by 'ap' and one held by 'tmp'.
You are not releasing the one held by 'tmp', and you must release
'tmp' even if it equals 'dp'.
It's pretty obvious you have no way by which to test these changes and
therefore are not doing so.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] serial/sunsu: add missing of_node_put()
@ 2018-12-03 4:57 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-12-03 4:57 UTC (permalink / raw)
To: tiny.windzz; +Cc: gregkh, jslaby, sparclinux, linux-serial, linux-kernel
From: Yangtao Li <tiny.windzz@gmail.com>
Date: Wed, 21 Nov 2018 11:06:15 -0500
> of_find_node_by_path() acquires a reference to the node
> returned by it and that reference needs to be dropped by its caller.
> This place is not doing this, so fix it.
>
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Several coding style problems and you are adding two new
leaks.
> + struct device_node *tmp;
> const char *keyb = of_get_property(ap, "keyboard", NULL);
> const char *ms = of_get_property(ap, "mouse", NULL);
Always order local variable declarations from longest to
shortest line.
>
> if (keyb) {
> - if (dp = of_find_node_by_path(keyb))
> - return SU_PORT_KBD;
> + tmp = of_find_node_by_path(keyb);
> + if (tmp && dp = tmp){
Always put a space between ")" and the "{" openning a new basic
block.
> + rc = SU_PORT_KBD;
> + goto out;
> + }
> }
> if (ms) {
> - if (dp = of_find_node_by_path(ms))
> - return SU_PORT_MS;
> + tmp = of_find_node_by_path(ms);
> + if (tmp && dp = tmp){
> + rc = SU_PORT_MS;
> + goto out;
> + }
> }
> }
>
> - return SU_PORT_PORT;
> +out:
> + of_node_put(ap);
> + return rc;
Now you have two references, one held by 'ap' and one held by 'tmp'.
You are not releasing the one held by 'tmp', and you must release
'tmp' even if it equals 'dp'.
It's pretty obvious you have no way by which to test these changes and
therefore are not doing so.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-03 4:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-21 16:06 [PATCH] serial/sunsu: add missing of_node_put() Yangtao Li
2018-11-21 16:06 ` Yangtao Li
2018-12-03 4:57 ` David Miller
2018-12-03 4:57 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.