All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Walle <michael@walle.cc>
To: Jonathan Corbet <corbet@lwn.net>,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
	Miquel Raynal <miquel.raynal@bootlin.com>,
	Rob Herring <robh+dt@kernel.org>,
	Frank Rowand <frowand.list@gmail.com>,
	Sascha Hauer <s.hauer@pengutronix.de>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	Michael Walle <michael@walle.cc>
Subject: [PATCH v4 05/20] nvmem: core: fix device node refcounting
Date: Wed, 23 Nov 2022 19:01:36 +0100	[thread overview]
Message-ID: <20221123180151.2160033-6-michael@walle.cc> (raw)
In-Reply-To: <20221123180151.2160033-1-michael@walle.cc>

In of_nvmem_cell_get(), of_get_next_parent() is used on cell_np. This
will decrement the refcount on cell_np, but cell_np is still used later
in the code. Use of_get_parent() instead and of_node_put() in the
appropriate places.

Signed-off-by: Michael Walle <michael@walle.cc>
---
changes since v3:
 - none

changes since v2:
 - new patch

 drivers/nvmem/core.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 321d7d63e068..205a427f564d 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -1242,16 +1242,21 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id)
 	if (!cell_np)
 		return ERR_PTR(-ENOENT);
 
-	nvmem_np = of_get_next_parent(cell_np);
-	if (!nvmem_np)
+	nvmem_np = of_get_parent(cell_np);
+	if (!nvmem_np) {
+		of_node_put(cell_np);
 		return ERR_PTR(-EINVAL);
+	}
 
 	nvmem = __nvmem_device_get(nvmem_np, device_match_of_node);
 	of_node_put(nvmem_np);
-	if (IS_ERR(nvmem))
+	if (IS_ERR(nvmem)) {
+		of_node_put(cell_np);
 		return ERR_CAST(nvmem);
+	}
 
 	cell_entry = nvmem_find_cell_entry_by_node(nvmem, cell_np);
+	of_node_put(cell_np);
 	if (!cell_entry) {
 		__nvmem_device_put(nvmem);
 		return ERR_PTR(-ENOENT);
-- 
2.30.2


WARNING: multiple messages have this Message-ID (diff)
From: Michael Walle <michael@walle.cc>
To: Jonathan Corbet <corbet@lwn.net>,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
	Miquel Raynal <miquel.raynal@bootlin.com>,
	Rob Herring <robh+dt@kernel.org>,
	Frank Rowand <frowand.list@gmail.com>,
	Sascha Hauer <s.hauer@pengutronix.de>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	Michael Walle <michael@walle.cc>
Subject: [PATCH v4 05/20] nvmem: core: fix device node refcounting
Date: Wed, 23 Nov 2022 19:01:36 +0100	[thread overview]
Message-ID: <20221123180151.2160033-6-michael@walle.cc> (raw)
In-Reply-To: <20221123180151.2160033-1-michael@walle.cc>

In of_nvmem_cell_get(), of_get_next_parent() is used on cell_np. This
will decrement the refcount on cell_np, but cell_np is still used later
in the code. Use of_get_parent() instead and of_node_put() in the
appropriate places.

Signed-off-by: Michael Walle <michael@walle.cc>
---
changes since v3:
 - none

changes since v2:
 - new patch

 drivers/nvmem/core.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 321d7d63e068..205a427f564d 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -1242,16 +1242,21 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id)
 	if (!cell_np)
 		return ERR_PTR(-ENOENT);
 
-	nvmem_np = of_get_next_parent(cell_np);
-	if (!nvmem_np)
+	nvmem_np = of_get_parent(cell_np);
+	if (!nvmem_np) {
+		of_node_put(cell_np);
 		return ERR_PTR(-EINVAL);
+	}
 
 	nvmem = __nvmem_device_get(nvmem_np, device_match_of_node);
 	of_node_put(nvmem_np);
-	if (IS_ERR(nvmem))
+	if (IS_ERR(nvmem)) {
+		of_node_put(cell_np);
 		return ERR_CAST(nvmem);
+	}
 
 	cell_entry = nvmem_find_cell_entry_by_node(nvmem, cell_np);
+	of_node_put(cell_np);
 	if (!cell_entry) {
 		__nvmem_device_put(nvmem);
 		return ERR_PTR(-ENOENT);
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-11-23 18:03 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-23 18:01 [PATCH v4 00/20] nvmem: core: introduce NVMEM layouts Michael Walle
2022-11-23 18:01 ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 01/20] net: add helper eth_addr_add() Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 02/20] of: base: add of_parse_phandle_with_optional_args() Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 03/20] of: property: make #.*-cells optional for simple props Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-30  0:45   ` Rob Herring
2022-11-30  0:45     ` Rob Herring
2022-11-23 18:01 ` [PATCH v4 04/20] of: property: add #nvmem-cell-cells property Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-30  0:45   ` Rob Herring
2022-11-30  0:45     ` Rob Herring
2022-11-23 18:01 ` Michael Walle [this message]
2022-11-23 18:01   ` [PATCH v4 05/20] nvmem: core: fix device node refcounting Michael Walle
2022-11-23 18:01 ` [PATCH v4 06/20] nvmem: core: add an index parameter to the cell Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 07/20] nvmem: core: move struct nvmem_cell_info to nvmem-provider.h Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 08/20] nvmem: core: drop the removal of the cells in nvmem_add_cells() Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 09/20] nvmem: core: add nvmem_add_one_cell() Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 10/20] nvmem: core: use nvmem_add_one_cell() in nvmem_add_cells_from_of() Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 11/20] nvmem: core: introduce NVMEM layouts Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 12/20] nvmem: core: add per-cell post processing Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 13/20] nvmem: core: allow to modify a cell before adding it Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 14/20] nvmem: imx-ocotp: replace global post processing with layouts Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 15/20] nvmem: cell: drop global cell_post_process Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 16/20] nvmem: core: provide own priv pointer in post process callback Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 17/20] nvmem: layouts: add sl28vpd layout Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 18/20] MAINTAINERS: add myself as sl28vpd nvmem layout driver Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 19/20] nvmem: layouts: Add ONIE tlv " Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 20/20] MAINTAINERS: Add myself as ONIE tlv NVMEM layout maintainer Michael Walle
2022-11-23 18:01   ` Michael Walle
2022-12-02 16:45 [PATCH v4 10/20] nvmem: core: use nvmem_add_one_cell() in nvmem_add_cells_from_of() kernel test robot
2022-12-03  8:30 ` Dan Carpenter
2022-12-03  8:30 ` Dan Carpenter
2022-12-05  8:45 ` Michael Walle
2022-12-05  8:45   ` Michael Walle

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=20221123180151.2160033-6-michael@walle.cc \
    --to=michael@walle.cc \
    --cc=corbet@lwn.net \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miquel.raynal@bootlin.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=srinivas.kandagatla@linaro.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: link
Be 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.