From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 875CE1DED53; Wed, 19 Feb 2025 09:22:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739956976; cv=none; b=bDuKAj5mTgrsefoWAqPzrAOEQqACslXfXEDAn0/xqYB7J35DYnCiD4SJty95C8m+JV/1SRDN2XM8lzk/S3qN0974ttx9GvdItRXGz7IaUvVLctUfqoYt8Sjdn4ABsRtOBo9jYM+TbQXNMNLZ4npI50iNRv0w28P4zXRqpvA5Zes= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739956976; c=relaxed/simple; bh=Jr/YZSCheX3YHsPmtKF4fAKdhqikRYA/4jykGZ/U/Kk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iUhFjPGAQl/BMW7x9W/T0pY9B1LJFY+kvSv03uATxDu+XsW284FRWY+esj4hWrTU1cUV78MA7LF8YwYt3PLa/xyTjo6PJWZBokwTioRuyeT0N+MVfXW7q43WYcKMK3DB75XyQq5IUq9uhxhHZ8Ucgz/ERdIfZhJCgTG2OW4sAlg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IPx1DgHo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IPx1DgHo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C671C4CEE8; Wed, 19 Feb 2025 09:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739956976; bh=Jr/YZSCheX3YHsPmtKF4fAKdhqikRYA/4jykGZ/U/Kk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IPx1DgHo5OJMt3PspEzc0GN8rDkjb52s7PdoBWAOsObDkMJTfiu996IMCfMHDZH0Q JPfZlXkB1qv+k/m3CICQ+ki/puAbB7+rPcWWVOc7eLFT4J+Yy/5IE+7j1v6nPX3sQ+ 5bB64BuKdER0zPtbMaO6DnhHLsfOpSfSgcwrRXRs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zijun Hu , "Rob Herring (Arm)" Subject: [PATCH 6.1 366/578] of: Correct child specifier used as input of the 2nd nexus node Date: Wed, 19 Feb 2025 09:26:10 +0100 Message-ID: <20250219082707.415966558@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zijun Hu commit e4c00c9b1f70cd11792ff5b825899a6ee0234a62 upstream. API of_parse_phandle_with_args_map() will use wrong input for nexus node Nexus_2 as shown below: Node_1 Nexus_1 Nexus_2 &Nexus_1,arg_1 -> arg_1,&Nexus_2,arg_2' -> &Nexus_2,arg_2 -> arg_2,... map-pass-thru=<...> Nexus_1's output arg_2 should be used as input of Nexus_2, but the API wrongly uses arg_2' instead which != arg_2 due to Nexus_1's map-pass-thru. Fix by always making @match_array point to @initial_match_array into which to store nexus output. Fixes: bd6f2fd5a1d5 ("of: Support parsing phandle argument lists through a nexus node") Cc: stable@vger.kernel.org Signed-off-by: Zijun Hu Link: https://lore.kernel.org/r/20250109-of_core_fix-v4-1-db8a72415b8c@quicinc.com Signed-off-by: Rob Herring (Arm) Signed-off-by: Greg Kroah-Hartman --- drivers/of/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1635,7 +1635,6 @@ int of_parse_phandle_with_args_map(const * specifier into the out_args structure, keeping the * bits specified in -map-pass-thru. */ - match_array = map - new_size; for (i = 0; i < new_size; i++) { __be32 val = *(map - new_size + i); @@ -1644,6 +1643,7 @@ int of_parse_phandle_with_args_map(const val |= cpu_to_be32(out_args->args[i]) & pass[i]; } + initial_match_array[i] = val; out_args->args[i] = be32_to_cpu(val); } out_args->args_count = list_size = new_size;