From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) (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 116AE13B5A0 for ; Tue, 16 Jul 2024 21:54:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=35.89.44.39 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721166842; cv=none; b=OE96cHWshaTnUy7r8WHsCSJ+5eJDrrUSxr+RiK1S37seTOv5kfSZDH0b6eahjaOVFyyjYqmbeisgwjAMZsUGX9eXbAPI3mNgwtDFXDim2Rq4WPBwTOsSGgo8KB1SmEaPGv87ELZg2Qhr4fvG3d4kuOVDXhN4x4KUtUTf8Vpntbc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721166842; c=relaxed/simple; bh=/v7SBEYyAFXSZP6HH1/ng/YIKTlSO2bhoybTNyrPRNg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=B7OTCh5p2wkBuQGemhcX+4mBIRAbDHcC1c4cvJnWAUF6DN+jglQR/FjBkd7fjPmLIPEnVTDSkAV+zaeQIErKV9L20kuUPbffjoMTMEaya/T1Jb1a1u058ka72iBHaAqp/SsWsEQ+xj1Fd3A/AJXufuAwKI9F5kx00GPcWNf9sog= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com; spf=pass smtp.mailfrom=embeddedor.com; dkim=pass (2048-bit key) header.d=embeddedor.com header.i=@embeddedor.com header.b=YkacCOVL; arc=none smtp.client-ip=35.89.44.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=embeddedor.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=embeddedor.com header.i=@embeddedor.com header.b="YkacCOVL" Received: from eig-obgw-6005a.ext.cloudfilter.net ([10.0.30.201]) by cmsmtp with ESMTPS id TNYks0H5fvH7lTq7Us8OKM; Tue, 16 Jul 2024 21:54:00 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id Tq7UsWEpaRBkMTq7UsIh4F; Tue, 16 Jul 2024 21:54:00 +0000 X-Authority-Analysis: v=2.4 cv=CbPD56rl c=1 sm=1 tr=0 ts=6696ebf8 a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=frY+GlAHrI6frpeK1MvySw==:17 a=IkcTkHD0fZMA:10 a=4kmOji7k6h8A:10 a=VwQbUJbxAAAA:8 a=9IUVmF_uN4HtD0BfTqgA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=Xt_RvD8W3m28Mn_h3AK8:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=embeddedor.com; s=default; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dV9YVxJPuIXVAPNCLnlMOQMoWavIDcj3/ND7BIJk3U8=; b=YkacCOVLokc2loc0vcE9mWz2fS R10osTZ0lvAJ4JU1of2wxfUzPI6AtXeZ0jAfZUYuM2d5b+uEtATlycuw96fwqsiYANg4xuSQDRwnu HrxrksHBQiVT0BnlP5nblFnRflb0IV/BXL1WxqpzFyUsABVC+p9ccteaszzezYZW4KgatllVVfwiJ R7QkqZE325glyIADCvkLhnNliEitk5Q2/U9DNrRTEYnAPVOJfsoch5c62+1yxiMVZwEl2nqpFtQmQ ZDTikQ2zVfuiN7dWXs8UP3r8cXpPYBQOAq367QTdXN/EZS7bRGFXVtD4T0QL/2McoRHTTNl1/87FJ 2bsYzLTQ==; Received: from [201.172.173.139] (port=33646 helo=[192.168.15.14]) by gator4166.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96.2) (envelope-from ) id 1sTq7T-000Vx6-2X; Tue, 16 Jul 2024 16:53:59 -0500 Message-ID: Date: Tue, 16 Jul 2024 15:53:58 -0600 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] interconnect: icc-clk: Add missed num_nodes initialization To: Kees Cook , Georgi Djakov Cc: linux-pm@vger.kernel.org, Konrad Dybcio , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org References: <20240716214819.work.328-kees@kernel.org> Content-Language: en-US From: "Gustavo A. R. Silva" In-Reply-To: <20240716214819.work.328-kees@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 201.172.173.139 X-Source-L: No X-Exim-ID: 1sTq7T-000Vx6-2X X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: ([192.168.15.14]) [201.172.173.139]:33646 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 23 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfE3wmhO5YKJjzrvn6dyISCgJNydlt9FNQuRqGqxRUVKbuTP4QfPVXKG81jm0J2tQzCIIkLMRC7W6b/Mn23mFDIwebhblQPpXHhuJ6V17QS1jgbvnzG7B F2TQKnLKdxHew3WtgYEJBktUcai4j6gxdgRE0A4KBTb/qUykjjX8JmUAkkrdHHsoO5zLLi268lS1lIzsQKosyikqz4sPNocuVZM= On 16/07/24 15:48, Kees Cook wrote: > 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 Thanks -- Gustavo > --- > Cc: Georgi Djakov > Cc: linux-pm@vger.kernel.org > --- > 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 f788db15cd76..b956e4050f38 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;