Commit 8537a701 authored by Zijun Hu's avatar Zijun Hu Committed by Rob Herring (Arm)
Browse files

of: Correct element count for two arrays in API of_parse_phandle_with_args_map() 



of_parse_phandle_with_args_map() defines array @dummy_mask and @dummy_pass
these two arrays only need @MAX_PHANDLE_ARGS elements separately, but they
actually have (@MAX_PHANDLE_ARGS + 1) elements, One extra element doesn't
hurt anything except for some stack usage.

Fix by using (@MAX_PHANDLE_ARGS - 1) as max element index in initializer.

Signed-off-by: default avatarZijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20250114-of_core_fix-v5-3-b8bafd00a86f@quicinc.com


Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
parent 81dfedd5

drivers/of/base.c

+2 −2
Original line number Diff line number Diff line
@@ -1448,8 +1448,8 @@ int of_parse_phandle_with_args_map(const struct device_node *np, 
	char *pass_name __free(kfree) = kasprintf(GFP_KERNEL, "%s-map-pass-thru", stem_name);

	struct device_node *cur, *new = NULL;

	const __be32 *map, *mask, *pass;

	static const __be32 dummy_mask[] = { [0 ... MAX_PHANDLE_ARGS] = cpu_to_be32(~0) };

	static const __be32 dummy_pass[] = { [0 ... MAX_PHANDLE_ARGS] = cpu_to_be32(0) };

	static const __be32 dummy_mask[] = { [0 ... (MAX_PHANDLE_ARGS - 1)] = cpu_to_be32(~0) };

	static const __be32 dummy_pass[] = { [0 ... (MAX_PHANDLE_ARGS - 1)] = cpu_to_be32(0) };

	__be32 initial_match_array[MAX_PHANDLE_ARGS];

	const __be32 *match_array = initial_match_array;

	int i, ret, map_len, match;