From nobody Fri Dec 26 03:24:45 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2C16447F72 for ; Wed, 10 Jan 2024 12:09:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CD7BE2F4; Wed, 10 Jan 2024 04:10:42 -0800 (PST) Received: from pluto.fritz.box (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 524BF3F73F; Wed, 10 Jan 2024 04:09:56 -0800 (PST) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: sudeep.holla@arm.com, Cristian Marussi Subject: [PATCH] firmware: arm_scmi: Rework Clock domains info lookups Date: Wed, 10 Jan 2024 12:09:16 +0000 Message-ID: <20240110120916.2482603-1-cristian.marussi@arm.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Accessing Clock domains descriptors by the index from the SCMI drivers can potentially lead to out-of-bound violations if the SCMI drivers misbehaves. Use a common helper to check the consistency of such accesses. Signed-off-by: Cristian Marussi --- drivers/firmware/arm_scmi/clock.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/= clock.c index b76ff23721df..ff1aa04e5a10 100644 --- a/drivers/firmware/arm_scmi/clock.c +++ b/drivers/firmware/arm_scmi/clock.c @@ -167,6 +167,15 @@ static enum scmi_clock_protocol_cmd evt_2_cmd[] =3D { CLOCK_RATE_CHANGE_REQUESTED_NOTIFY, }; =20 +static inline struct scmi_clock_info * +scmi_clock_domain_lookup(struct clock_info *ci, u32 clk_id) +{ + if (clk_id >=3D ci->num_clocks) + return ERR_PTR(-EINVAL); + + return ci->clk + clk_id; +} + static int scmi_clock_protocol_attributes_get(const struct scmi_protocol_handle *ph, struct clock_info *ci) @@ -580,10 +589,9 @@ scmi_clock_set_parent(const struct scmi_protocol_handl= e *ph, u32 clk_id, struct clock_info *ci =3D ph->get_priv(ph); struct scmi_clock_info *clk; =20 - if (clk_id >=3D ci->num_clocks) - return -EINVAL; - - clk =3D ci->clk + clk_id; + clk =3D scmi_clock_domain_lookup(ci, clk_id); + if (IS_ERR(clk)) + return PTR_ERR(clk); =20 if (parent_id >=3D clk->num_parents) return -EINVAL; @@ -800,10 +808,10 @@ scmi_clock_info_get(const struct scmi_protocol_handle= *ph, u32 clk_id) struct scmi_clock_info *clk; struct clock_info *ci =3D ph->get_priv(ph); =20 - if (clk_id >=3D ci->num_clocks) + clk =3D scmi_clock_domain_lookup(ci, clk_id); + if (IS_ERR(clk)) return NULL; =20 - clk =3D ci->clk + clk_id; if (!clk->name[0]) return NULL; =20 --=20 2.43.0