From: frowand.list@gmail.com To: Rob Herring <robh+dt@kernel.org>, Pantelis Antoniou <pantelis.antoniou@konsulko.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Alan Tull <atull@kernel.org>, Moritz Fischer <mdf@kernel.org> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH 03/16] of: overlay: add missing of_node_get() in __of_attach_node_sysfs Date: Thu, 4 Oct 2018 21:12:34 -0700 [thread overview] Message-ID: <1538712767-30394-4-git-send-email-frowand.list@gmail.com> (raw) In-Reply-To: <1538712767-30394-1-git-send-email-frowand.list@gmail.com> From: Frank Rowand <frank.rowand@sony.com> There is a matching of_node_put() in __of_detach_node_sysfs() Remove misleading comment from function header comment for of_detach_node(). This patch may result in memory leaks from code that directly calls the dynamic node add and delete functions directly instead of using changesets. Signed-off-by: Frank Rowand <frank.rowand@sony.com> --- This patch should result in powerpc systems that dynamically allocate a node, then later deallocate the node to have a memory leak when the node is deallocated. The next patch in the series will fix the leak. drivers/of/dynamic.c | 3 --- drivers/of/kobj.c | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index b04ee021a891..275c0d7e2268 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -272,9 +272,6 @@ void __of_detach_node(struct device_node *np) /** * of_detach_node() - "Unplug" a node from the device tree. - * - * The caller must hold a reference to the node. The memory associated with - * the node is not freed until its refcount goes to zero. */ int of_detach_node(struct device_node *np) { diff --git a/drivers/of/kobj.c b/drivers/of/kobj.c index 7a0a18980b98..c72eef988041 100644 --- a/drivers/of/kobj.c +++ b/drivers/of/kobj.c @@ -133,6 +133,9 @@ int __of_attach_node_sysfs(struct device_node *np) } if (!name) return -ENOMEM; + + of_node_get(np); + rc = kobject_add(&np->kobj, parent, "%s", name); kfree(name); if (rc) @@ -159,6 +162,5 @@ void __of_detach_node_sysfs(struct device_node *np) kobject_del(&np->kobj); } - /* finally remove the kobj_init ref */ of_node_put(np); } -- Frank Rowand <frank.rowand@sony.com>
WARNING: multiple messages have this Message-ID (diff)
From: frowand.list@gmail.com To: Rob Herring <robh+dt@kernel.org>, Pantelis Antoniou <pantelis.antoniou@konsulko.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Alan Tull <atull@kernel.org>, Moritz Fischer <mdf@kernel.org> Cc: devicetree@vger.kernel.org, linux-fpga@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/16] of: overlay: add missing of_node_get() in __of_attach_node_sysfs Date: Thu, 4 Oct 2018 21:12:34 -0700 [thread overview] Message-ID: <1538712767-30394-4-git-send-email-frowand.list@gmail.com> (raw) In-Reply-To: <1538712767-30394-1-git-send-email-frowand.list@gmail.com> From: Frank Rowand <frank.rowand@sony.com> There is a matching of_node_put() in __of_detach_node_sysfs() Remove misleading comment from function header comment for of_detach_node(). This patch may result in memory leaks from code that directly calls the dynamic node add and delete functions directly instead of using changesets. Signed-off-by: Frank Rowand <frank.rowand@sony.com> --- This patch should result in powerpc systems that dynamically allocate a node, then later deallocate the node to have a memory leak when the node is deallocated. The next patch in the series will fix the leak. drivers/of/dynamic.c | 3 --- drivers/of/kobj.c | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index b04ee021a891..275c0d7e2268 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -272,9 +272,6 @@ void __of_detach_node(struct device_node *np) /** * of_detach_node() - "Unplug" a node from the device tree. - * - * The caller must hold a reference to the node. The memory associated with - * the node is not freed until its refcount goes to zero. */ int of_detach_node(struct device_node *np) { diff --git a/drivers/of/kobj.c b/drivers/of/kobj.c index 7a0a18980b98..c72eef988041 100644 --- a/drivers/of/kobj.c +++ b/drivers/of/kobj.c @@ -133,6 +133,9 @@ int __of_attach_node_sysfs(struct device_node *np) } if (!name) return -ENOMEM; + + of_node_get(np); + rc = kobject_add(&np->kobj, parent, "%s", name); kfree(name); if (rc) @@ -159,6 +162,5 @@ void __of_detach_node_sysfs(struct device_node *np) kobject_del(&np->kobj); } - /* finally remove the kobj_init ref */ of_node_put(np); } -- Frank Rowand <frank.rowand@sony.com>
next prev parent reply other threads:[~2018-10-05 4:15 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-05 4:12 [PATCH 00/16] of: overlay: validation checks, subsequent fixes frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 01/16] of: overlay: add tests to validate kfrees from overlay removal frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 02/16] of: overlay: add missing of_node_put() after add new node to changeset frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` frowand.list [this message] 2018-10-05 4:12 ` [PATCH 03/16] of: overlay: add missing of_node_get() in __of_attach_node_sysfs frowand.list 2018-10-05 4:12 ` [PATCH 04/16] powerpc/pseries: add of_node_put() in dlpar_detach_node() frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 05/16] of: overlay: use prop add changeset entry for property in new nodes frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-09 20:28 ` Alan Tull 2018-10-09 20:28 ` Alan Tull 2018-10-09 20:28 ` Alan Tull 2018-10-09 23:44 ` Frank Rowand 2018-10-09 23:44 ` Frank Rowand 2018-10-09 23:44 ` Frank Rowand 2018-10-10 6:04 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " frowand.list 2018-10-10 6:04 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " frowand.list 2018-10-10 6:49 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Frank Rowand 2018-10-10 6:49 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Frank Rowand 2018-10-10 20:40 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Alan Tull 2018-10-10 20:40 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Alan Tull 2018-10-10 20:40 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Alan Tull 2018-10-10 21:03 ` Frank Rowand 2018-10-10 21:03 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Frank Rowand 2018-10-10 21:03 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Frank Rowand 2018-10-11 5:39 ` Frank Rowand 2018-10-11 5:39 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Frank Rowand 2018-10-11 5:39 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Frank Rowand 2018-10-11 18:57 ` Alan Tull 2018-10-11 19:33 ` Alan Tull 2018-10-11 19:33 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Alan Tull 2018-10-11 19:33 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Alan Tull 2018-10-11 23:38 ` Frank Rowand 2018-10-11 23:38 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux, phandle " Frank Rowand 2018-10-11 23:38 ` [PATCH 05.1/16] of:overlay: missing name, phandle, linux,phandle " Frank Rowand 2018-10-05 4:12 ` [PATCH 06/16] of: overlay: do not duplicate properties from overlay for " frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 07/16] of: dynamic: change type of of_{at,de}tach_node() to void frowand.list 2018-10-05 4:12 ` [PATCH 07/16] of: dynamic: change type of of_{at, de}tach_node() " frowand.list 2018-10-05 4:12 ` [PATCH 08/16] of: overlay: reorder fields in struct fragment frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 09/16] of: overlay: validate overlay properties #address-cells and #size-cells frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 15:07 ` Rob Herring 2018-10-05 15:07 ` Rob Herring 2018-10-05 18:53 ` Frank Rowand 2018-10-05 18:53 ` Frank Rowand 2018-10-05 19:04 ` Rob Herring 2018-10-05 19:04 ` Rob Herring 2018-10-05 19:09 ` Frank Rowand 2018-10-05 19:09 ` Frank Rowand 2018-10-08 15:57 ` Alan Tull 2018-10-08 15:57 ` Alan Tull 2018-10-08 15:57 ` Alan Tull 2018-10-08 18:46 ` Alan Tull 2018-10-08 18:46 ` Alan Tull 2018-10-08 18:46 ` Alan Tull 2018-10-09 0:02 ` Frank Rowand 2018-10-09 0:02 ` Frank Rowand 2018-10-09 0:02 ` Frank Rowand 2018-10-09 18:40 ` Alan Tull 2018-10-09 18:40 ` Alan Tull 2018-10-09 18:40 ` Alan Tull 2018-10-05 4:12 ` [PATCH 10/16] of: overlay: make all pr_debug() and pr_err() messages unique frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 11/16] of: overlay: test case of two fragments adding same node frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 12/16] of: overlay: check prevents multiple fragments add or delete " frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 13/16] of: overlay: check prevents multiple fragments touching same property frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 14/16] of: unittest: remove unused of_unittest_apply_overlay() argument frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 4:12 ` [PATCH 15/16] of: unittest: initialize args before calling of_irq_parse_one() frowand.list 2018-10-05 4:12 ` frowand.list 2018-10-05 13:26 ` Guenter Roeck 2018-10-05 13:26 ` Guenter Roeck 2018-10-05 19:05 ` Frank Rowand 2018-10-05 19:05 ` Frank Rowand 2018-10-05 14:53 ` Rob Herring 2018-10-05 14:53 ` Rob Herring 2018-10-05 19:04 ` Frank Rowand 2018-10-05 19:04 ` Frank Rowand 2018-10-05 4:12 ` [PATCH 16/16] of: unittest: find overlays[] entry by name instead of index frowand.list 2018-10-05 4:12 ` frowand.list
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1538712767-30394-4-git-send-email-frowand.list@gmail.com \ --to=frowand.list@gmail.com \ --cc=atull@kernel.org \ --cc=benh@kernel.crashing.org \ --cc=devicetree@vger.kernel.org \ --cc=linux-fpga@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mdf@kernel.org \ --cc=mpe@ellerman.id.au \ --cc=pantelis.antoniou@konsulko.com \ --cc=paulus@samba.org \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.