linux-kernel - [PATCH v4 07/14] of: property: Fix potential fwnode reference's argument count got out of range

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20250109-of_core_fix-v4-7-db8a72415b8c@quicinc.com>
Date: Thu, 09 Jan 2025 21:26:58 +0800
From: Zijun Hu <zijun_hu@...oud.com>
To: Rob Herring <robh@...nel.org>, Saravana Kannan <saravanak@...gle.com>, 
 Maxime Ripard <mripard@...nel.org>, Robin Murphy <robin.murphy@....com>, 
 Grant Likely <grant.likely@...retlab.ca>, Marc Zyngier <maz@...nel.org>, 
 Andreas Herrmann <andreas.herrmann@...xeda.com>, 
 Marek Szyprowski <m.szyprowski@...sung.com>, 
 Catalin Marinas <catalin.marinas@....com>, Mike Rapoport <rppt@...nel.org>, 
 Oreoluwa Babatunde <quic_obabatun@...cinc.com>
Cc: Zijun Hu <zijun_hu@...oud.com>, devicetree@...r.kernel.org, 
 linux-kernel@...r.kernel.org, Zijun Hu <quic_zijuhu@...cinc.com>
Subject: [PATCH v4 07/14] of: property: Fix potential fwnode reference's
 argument count got out of range

From: Zijun Hu <quic_zijuhu@...cinc.com>

Currently, the maximal fwnode reference argument count supported is
8, and the maximal OF node phandle argument count supported is 16, but
of_fwnode_get_reference_args() directly assigns OF node phandle count
@of_args.args_count to fwnode reference count @args->nargs, so may cause
fwnode reference argument count got is out of range, namely, in [9, 16].

Fix by truncating @args->nargs got to 8 and warning if it > 8.

Fixes: b66548e2a9ba ("of: Increase MAX_PHANDLE_ARGS")
Signed-off-by: Zijun Hu <quic_zijuhu@...cinc.com>
---
 drivers/of/property.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/of/property.c b/drivers/of/property.c
index 6245cbff3527d762c16e7f4b7b7b3d4f2e9ddbe6..5ef9b2ced43ee7c4bfe88ea3cb11f3182da0dab9 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -1072,6 +1072,11 @@ of_fwnode_get_reference_args(const struct fwnode_handle *fwnode,
 	}
 
 	args->nargs = of_args.args_count;
+	if (args->nargs > NR_FWNODE_REFERENCE_ARGS) {
+		pr_warn("%s: Truncate arg count %d for property '%s' phandle index %d\n",
+			__func__, of_args.args_count, prop, index);
+		args->nargs = NR_FWNODE_REFERENCE_ARGS;
+	}
 	args->fwnode = of_fwnode_handle(of_args.np);
 
 	for (i = 0; i < NR_FWNODE_REFERENCE_ARGS; i++)

-- 
2.34.1