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>
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 v3 03/18] nvmem: core: fix device node refcounting
Date: Fri, 18 Nov 2022 19:51:03 +0100 [thread overview]
Message-ID: <20221118185118.1190044-4-michael@walle.cc> (raw)
In-Reply-To: <20221118185118.1190044-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 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
next prev parent reply other threads:[~2022-11-18 18:52 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 18:51 [PATCH v3 00/18] nvmem: core: introduce NVMEM layouts Michael Walle
2022-11-18 18:51 ` [PATCH v3 01/18] net: add helper eth_addr_add() Michael Walle
2022-11-18 18:51 ` [PATCH v3 02/18] of: base: add of_parse_phandle_with_optional_args() Michael Walle
2022-11-18 21:31 ` Michael Walle
2022-11-18 21:40 ` [PATCH] of: property: special #nvmem-cell-cells handling Michael Walle
2022-11-18 21:52 ` Rob Herring
2022-11-18 22:03 ` Michael Walle
2022-11-22 23:44 ` Rob Herring
2022-11-23 12:24 ` Miquel Raynal
2022-11-18 18:51 ` Michael Walle [this message]
2022-11-18 18:51 ` [PATCH v3 04/18] nvmem: core: add an index parameter to the cell Michael Walle
2022-11-18 18:51 ` [PATCH v3 05/18] nvmem: core: move struct nvmem_cell_info to nvmem-provider.h Michael Walle
2022-11-18 18:51 ` [PATCH v3 06/18] nvmem: core: drop the removal of the cells in nvmem_add_cells() Michael Walle
2022-11-21 7:56 ` Sascha Hauer
2022-11-18 18:51 ` [PATCH v3 07/18] nvmem: core: add nvmem_add_one_cell() Michael Walle
2022-11-18 18:51 ` [PATCH v3 08/18] nvmem: core: use nvmem_add_one_cell() in nvmem_add_cells_from_of() Michael Walle
2022-11-18 18:51 ` [PATCH v3 09/18] nvmem: core: introduce NVMEM layouts Michael Walle
2022-11-18 18:51 ` [PATCH v3 10/18] nvmem: core: add per-cell post processing Michael Walle
2022-11-18 18:51 ` [PATCH v3 11/18] nvmem: core: allow to modify a cell before adding it Michael Walle
2022-11-18 18:51 ` [PATCH v3 12/18] nvmem: imx-ocotp: replace global post processing with layouts Michael Walle
2022-11-18 18:51 ` [PATCH v3 13/18] nvmem: cell: drop global cell_post_process Michael Walle
2022-11-18 18:51 ` [PATCH v3 14/18] nvmem: core: provide own priv pointer in post process callback Michael Walle
2022-11-18 18:51 ` [PATCH v3 15/18] nvmem: layouts: add sl28vpd layout Michael Walle
2022-11-18 18:51 ` [PATCH v3 16/18] MAINTAINERS: add myself as sl28vpd nvmem layout driver Michael Walle
2022-11-18 18:51 ` [PATCH v3 17/18] nvmem: layouts: Add ONIE tlv " Michael Walle
2022-11-21 7:51 ` Sascha Hauer
2022-11-23 9:52 ` Michael Walle
2022-11-18 18:51 ` [PATCH v3 18/18] MAINTAINERS: Add myself as ONIE tlv NVMEM layout maintainer 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=20221118185118.1190044-4-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=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 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).