linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v7 03/17] of: overlay: add missing of_node_get() in __of_attach_node_sysfs
Date: Thu,  8 Nov 2018 22:05:51 -0800	[thread overview]
Message-ID: <1541743565-23163-4-git-send-email-frowand.list@gmail.com> (raw)
In-Reply-To: <1541743565-23163-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.

This commit 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 commit will fix the leak.

Tested-by: Alan Tull <atull@kernel.org>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
---
 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 12c3f9a15e94..146681540487 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>


  parent reply	other threads:[~2018-11-09  6:07 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-09  6:05 [PATCH v7 00/17] of: overlay: validation checks, subsequent fixes frowand.list
2018-11-09  6:05 ` [PATCH v7 01/17] of: overlay: add tests to validate kfrees from overlay removal frowand.list
2018-11-09  6:05 ` [PATCH v7 02/17] of: overlay: add missing of_node_put() after add new node to changeset frowand.list
2018-11-09  6:05 ` frowand.list [this message]
2018-11-09  6:05 ` [PATCH v7 04/17] powerpc/pseries: add of_node_put() in dlpar_detach_node() frowand.list
2018-11-09  6:05 ` [PATCH v7 05/17] of: overlay: use prop add changeset entry for property in new nodes frowand.list
2018-11-09  6:05 ` [PATCH v7 06/17] of: overlay: do not duplicate properties from overlay for " frowand.list
2018-11-09  6:05 ` [PATCH v7 07/17] of: overlay: reorder fields in struct fragment frowand.list
2018-11-09  6:05 ` [PATCH v7 08/17] of: overlay: validate overlay properties #address-cells and #size-cells frowand.list
2018-11-09  6:05 ` [PATCH v7 09/17] of: overlay: make all pr_debug() and pr_err() messages unique frowand.list
2018-11-09  6:05 ` [PATCH v7 10/17] of: overlay: test case of two fragments adding same node frowand.list
2018-11-09  6:05 ` [PATCH v7 11/17] of: overlay: check prevents multiple fragments add or delete " frowand.list
2018-11-09  6:06 ` [PATCH v7 12/17] of: overlay: check prevents multiple fragments touching same property frowand.list
2018-11-09  6:06 ` [PATCH v7 13/17] of: unittest: remove unused of_unittest_apply_overlay() argument frowand.list
2018-11-09  6:06 ` [PATCH v7 14/17] of: overlay: set node fields from properties when add new overlay node frowand.list
2018-11-09  6:06 ` [PATCH v7 15/17] of: unittest: allow base devicetree to have symbol metadata frowand.list
2018-11-09  6:06 ` [PATCH v7 16/17] of: unittest: find overlays[] entry by name instead of index frowand.list
2018-11-09  6:06 ` [PATCH v7 17/17] of: unittest: initialize args before calling of_*parse_*() 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=1541743565-23163-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 \
    --subject='Re: [PATCH v7 03/17] of: overlay: add missing of_node_get() in __of_attach_node_sysfs' \
    /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: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).