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 8AA6A19752C; Wed, 2 Oct 2024 14:44:38 +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=1727880278; cv=none; b=MP/PzoAqAX5Uh44Rkrmq9AptUIFkuXxB8RqrNhZVrZ156vtTYFj0qaSMEIWlcUYjZkRBiXXFdulOihTXimOWyLYbzTnMGHQRTLI1DZvlz6jiHl+LkCXVGjzN5luT/3Qv6YttlSAkieITbcNL7DQXlhZq3NfKh5u3DyrnxThoRSI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727880278; c=relaxed/simple; bh=+iqzidG4+zR2i8gKwF7XRV9DA59pMo4fmC60onNJ928=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RkTyUTtYBvo3Bi/O2MYtcZDlJU9oe+dqrsj1vHhiEsk65qutc1ExUPJ2Noxa6wrd6fcbM/dp97lqiwFRLVK9Tm81LLwxvhyPYGRR5GEDEMOcIdjwiV4SneRs/pww+jliXiZzxcGsDzECgk1F+6xjLNPzYBSKxmLz/RwJA0k/pFs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KnlHPct/; 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="KnlHPct/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1401BC4CEC2; Wed, 2 Oct 2024 14:44:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727880278; bh=+iqzidG4+zR2i8gKwF7XRV9DA59pMo4fmC60onNJ928=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KnlHPct/2dZTbuVF/nnwKZZ/KWB9JdRIGumtx89qBDw/ImQNE70urbgVpziQUUx9U 8TOyaYXYCvlvma4SFQckiQBLGXxnsj5j0FlLq6VbFCxvoNRjSArKDUXFFUSruJjxuD 7LvQuVEgjtcS2ZuolzQ8I6tvlSw52cefGhKIISHE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kees Cook , "Gustavo A. R. Silva" , Georgi Djakov , Sasha Levin Subject: [PATCH 6.6 364/538] interconnect: icc-clk: Add missed num_nodes initialization Date: Wed, 2 Oct 2024 15:00:03 +0200 Message-ID: <20241002125806.793859720@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125751.964700919@linuxfoundation.org> References: <20241002125751.964700919@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kees Cook [ Upstream commit c801ed86840ec38b2a9bcafeee3d7c9e14c743f3 ] With the new __counted_by annotation, the "num_nodes" struct member must be set before accessing the "nodes" array. This initialization was done in other places where a new struct icc_onecell_data is allocated, but this case in icc_clk_register() was missed. Set "num_nodes" after allocation. Fixes: dd4904f3b924 ("interconnect: qcom: Annotate struct icc_onecell_data with __counted_by") Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Link: https://lore.kernel.org/r/20240716214819.work.328-kees@kernel.org Signed-off-by: Georgi Djakov Signed-off-by: Sasha Levin --- drivers/interconnect/icc-clk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/interconnect/icc-clk.c b/drivers/interconnect/icc-clk.c index d787f2ea36d97..a91df709cfb2f 100644 --- a/drivers/interconnect/icc-clk.c +++ b/drivers/interconnect/icc-clk.c @@ -87,6 +87,7 @@ struct icc_provider *icc_clk_register(struct device *dev, onecell = devm_kzalloc(dev, struct_size(onecell, nodes, 2 * num_clocks), GFP_KERNEL); if (!onecell) return ERR_PTR(-ENOMEM); + onecell->num_nodes = 2 * num_clocks; qp = devm_kzalloc(dev, struct_size(qp, clocks, num_clocks), GFP_KERNEL); if (!qp) @@ -133,8 +134,6 @@ struct icc_provider *icc_clk_register(struct device *dev, onecell->nodes[j++] = node; } - onecell->num_nodes = j; - ret = icc_provider_register(provider); if (ret) goto err; -- 2.43.0