mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Zijun Hu <zijun_hu@icloud.com>
To: Rob Herring <robh@kernel.org>,
	Saravana Kannan <saravanak@google.com>,
	 Leif Lindholm <leif.lindholm@linaro.org>,
	 Stephen Boyd <stephen.boyd@linaro.org>,
	Maxime Ripard <mripard@kernel.org>,
	 Robin Murphy <robin.murphy@arm.com>,
	 Grant Likely <grant.likely@secretlab.ca>
Cc: Zijun Hu <zijun_hu@icloud.com>,
	devicetree@vger.kernel.org,  linux-kernel@vger.kernel.org,
	Zijun Hu <quic_zijuhu@quicinc.com>,
	 stable@vger.kernel.org
Subject: [PATCH 02/10] of: Correct return value for API of_parse_phandle_with_args_map()
Date: Fri, 06 Dec 2024 08:52:28 +0800	[thread overview]
Message-ID: <20241206-of_core_fix-v1-2-dc28ed56bec3@quicinc.com> (raw)
In-Reply-To: <20241206-of_core_fix-v1-0-dc28ed56bec3@quicinc.com>

From: Zijun Hu <quic_zijuhu@quicinc.com>

@ret is used by of_parse_phandle_with_args_map() to record return value
and it is preseted with -EINVAL before the outer while loop, but it is
changed to 0 by below successful operation within the inner loop:
of_property_read_u32(new, cells_name, &new_size)

So cause 0(success) is returned for all failures which happen after the
operation, that is obviously wrong.

Fix by restoring @ret with preseted -EINVAL after the operation.

Fixes: bd6f2fd5a1d5 ("of: Support parsing phandle argument lists through a nexus node")
Cc: stable@vger.kernel.org
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
---
 drivers/of/base.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 9a9313183d1f1b61918fe7e6fa80c2726b099a1c..b294924aa31cfed1ec06983f420a445f7fae7394 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1516,6 +1516,8 @@ int of_parse_phandle_with_args_map(const struct device_node *np,
 			ret = of_property_read_u32(new, cells_name, &new_size);
 			if (ret)
 				goto put;
+			/* Restore preseted error code */
+			ret = -EINVAL;
 
 			/* Check for malformed properties */
 			if (WARN_ON(new_size > MAX_PHANDLE_ARGS))

-- 
2.34.1


  parent reply	other threads:[~2024-12-06  0:53 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-06  0:52 [PATCH 00/10] of: fix bugs and improve codes Zijun Hu
2024-12-06  0:52 ` [PATCH 01/10] of: Fix alias name length calculating error in API of_find_node_opts_by_path() Zijun Hu
2024-12-09 13:24   ` Rob Herring
2024-12-09 13:31     ` Zijun Hu
2024-12-06  0:52 ` Zijun Hu [this message]
2024-12-09 13:26   ` [PATCH 02/10] of: Correct return value for API of_parse_phandle_with_args_map() Rob Herring
2024-12-06  0:52 ` [PATCH 03/10] of: Correct child specifier used as input of the 2nd nexus node Zijun Hu
2024-12-06  0:52 ` [PATCH 04/10] of: Fix refcount leakage for OF node returned by __of_get_dma_parent() Zijun Hu
2024-12-09 20:32   ` Rob Herring
2024-12-06  0:52 ` [PATCH 05/10] of: Fix available buffer size calculating error in API of_device_uevent_modalias() Zijun Hu
2024-12-09 20:34   ` Rob Herring
2024-12-10 12:39     ` Zijun Hu
2024-12-10 14:10       ` Rob Herring
2024-12-11 11:44         ` Zijun Hu
2024-12-06  0:52 ` [PATCH 06/10] of/fdt: Dump __be32 array in CPU type order in of_dump_addr() Zijun Hu
2024-12-09 20:37   ` Rob Herring
2024-12-06  0:52 ` [PATCH 07/10] of: Correct comments for of_alias_scan() Zijun Hu
2024-12-09 13:20   ` Rob Herring
2024-12-09 13:41     ` Zijun Hu
2024-12-06  0:52 ` [PATCH 08/10] of: Swap implementation between of_property_present() and of_property_read_bool() Zijun Hu
2024-12-06  0:52 ` [PATCH 09/10] of: property: Implement of_fwnode_property_present() by of_property_present() Zijun Hu
2024-12-09 16:48   ` Rob Herring
2024-12-10 12:44     ` Zijun Hu
2024-12-10 13:37       ` Robin Murphy
2024-12-06  0:52 ` [PATCH 10/10] of: Simplify API of_find_node_with_property() implementation Zijun Hu
2024-12-09 20:38   ` Rob Herring

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=20241206-of_core_fix-v1-2-dc28ed56bec3@quicinc.com \
    --to=zijun_hu@icloud.com \
    --cc=devicetree@vger.kernel.org \
    --cc=grant.likely@secretlab.ca \
    --cc=leif.lindholm@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mripard@kernel.org \
    --cc=quic_zijuhu@quicinc.com \
    --cc=robh@kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=saravanak@google.com \
    --cc=stable@vger.kernel.org \
    --cc=stephen.boyd@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

all inboxes | Powered by JetHome®