From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C8DF2D1AD3A for ; Wed, 16 Oct 2024 10:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BkfAR851CKsLCLbvtcih5Xo4vjWxnba9CIukA8lSntQ=; b=kYUkWdtBtE7/k9cU4kgOxdaEJ4 WAkdX7sXSBjRD8BtjqEbqWfo8PyUgoUifGvfLZZdygy4r9CtV1wPN1Gb1jH+ixbeby6JTP0b1+6U4 OgMcsSK3sYMjnZmXOuAemWpA80OxR4OFg8L/qySmO3rlgXtB68GV7cUvU6mHSGoQrb3uELZXEJOK1 0miRgm+sMzDRkO95LJhMq1J+xtlei6Jp09VDsaeR25MFPQyfYbYwGxezMF8GBM6vzii3jbbRQh/Ci zv4YK/UQiLIyn0/1KrW2w83ZAd6Sr3E/pU89Oq0Jm5IpksVfaMralgRTSuAvH3KqpiLNYBHZD/OVa kQyjQuYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t10sh-0000000BLi2-1gsf; Wed, 16 Oct 2024 10:03:51 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t10q8-0000000BLKw-3ctO for linux-arm-kernel@lists.infradead.org; Wed, 16 Oct 2024 10:01:14 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id BFFA85C5A4F; Wed, 16 Oct 2024 10:01:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9B4CC4CEC5; Wed, 16 Oct 2024 10:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729072871; bh=D39NBDdVFY1jqqBfci4OkEy41KSDh8bapxuV2d7f1Ow=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RFL5+1eUB/7QVL7nq53SyV6YL2Oz5Do7vcTbjSkcuZ6Re3Js90pykGY6b3OxJRdkr xJ+i+izBe0aBS8VOKfz6KWl5qEqh9xYcxg5VfIGJN4lLfyaV8LsM/oud5hx9p/f8KS Ypk4C1qsvB3dSX1dAZyFuLxgKjwtmEBpvw6hECSr/qcptdcbClqFXR9JQApm71FBgD n5FombtcGen+fWJS/8QGUtt3X29UdQmM0y20DP0XZiqVXAhkVkVaIi2sf0e+TNFYSd Vu8NvcvCGpGhnbB5ftgIkHn8zbwd6fsKzUnxAxxJgObO90hgAKlr+KELaagNPlvmfH Sm73QXNUsNu3A== Date: Wed, 16 Oct 2024 12:01:06 +0200 From: Lorenzo Pieralisi To: Zheng Zengkai Cc: guohanjun@huawei.com, sudeep.holla@arm.com, mark.rutland@arm.com, maz@kernel.org, rafael@kernel.org, lenb@kernel.org, daniel.lezcano@linaro.org, tglx@linutronix.de, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4] ACPI: GTDT: Tighten the check for the array of platform timer structures Message-ID: References: <20241016095458.34126-1-zhengzengkai@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241016095458.34126-1-zhengzengkai@huawei.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241016_030113_127459_F309CA8D X-CRM114-Status: GOOD ( 30.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Oct 16, 2024 at 05:54:58PM +0800, Zheng Zengkai wrote: > As suggested by Marc and Lorenzo, first we need to check whether the > platform_timer entry pointer is within gtdt bounds (< gtdt_end) before > de-referencing what it points at to detect the length of the platform > timer struct and then check that the length of current platform_timer > struct is also valid, i.e. the length is not zero and within gtdt_end. > Now next_platform_timer() only checks against gtdt_end for the entry of > subsequent platform timer without checking the length of it and will > not report error if the check failed and the existing check in function > acpi_gtdt_init() is also not enough. > > Modify the for_each_platform_timer() iterator and use it combined with > a dedicated check function platform_timer_valid() to do the check > against table length (gtdt_end) for each element of platform timer > array in function acpi_gtdt_init(), making sure that both their entry > and length actually fit in the table. > > Suggested-by: Lorenzo Pieralisi > Co-developed-by: Marc Zyngier > Signed-off-by: Marc Zyngier > Signed-off-by: Zheng Zengkai > --- > Changes in v4: > - remove the tmp pointer to make the code more concise. > > Changes in v3: > - based on Marc's patch and reuse the for_each_platform_timer() loop > Link to v3: https://lore.kernel.org/linux-arm-kernel/20241015152602.184108-1-zhengzengkai@huawei.com/ > > Changes in v2: > - Check against gtdt_end for both entry and len of each array element > Link to v2: https://lore.kernel.org/linux-arm-kernel/20241012085343.6594-1-zhengzengkai@huawei.com/ > > Link to v1: https://lore.kernel.org/all/20241010144703.113728-1-zhengzengkai@huawei.com/ > > Link to previous related patches: > https://lore.kernel.org/all/20241008082429.33646-1-zhengzengkai@huawei.com/ > https://lore.kernel.org/all/20240930030716.179992-1-zhengzengkai@huawei.com/ > --- > drivers/acpi/arm64/gtdt.c | 29 ++++++++++++++++++++--------- > 1 file changed, 20 insertions(+), 9 deletions(-) Reviewed-by: Lorenzo Pieralisi > diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c > index c0e77c1c8e09..d7c4e1b9915b 100644 > --- a/drivers/acpi/arm64/gtdt.c > +++ b/drivers/acpi/arm64/gtdt.c > @@ -36,19 +36,25 @@ struct acpi_gtdt_descriptor { > > static struct acpi_gtdt_descriptor acpi_gtdt_desc __initdata; > > -static inline __init void *next_platform_timer(void *platform_timer) > +static __init bool platform_timer_valid(void *platform_timer) > { > struct acpi_gtdt_header *gh = platform_timer; > > - platform_timer += gh->length; > - if (platform_timer < acpi_gtdt_desc.gtdt_end) > - return platform_timer; > + return (platform_timer >= (void *)(acpi_gtdt_desc.gtdt + 1) && > + platform_timer < acpi_gtdt_desc.gtdt_end && > + gh->length != 0 && > + platform_timer + gh->length <= acpi_gtdt_desc.gtdt_end); > +} > + > +static __init void *next_platform_timer(void *platform_timer) > +{ > + struct acpi_gtdt_header *gh = platform_timer; > > - return NULL; > + return platform_timer + gh->length; > } > > #define for_each_platform_timer(_g) \ > - for (_g = acpi_gtdt_desc.platform_timer; _g; \ > + for (_g = acpi_gtdt_desc.platform_timer; platform_timer_valid(_g);\ > _g = next_platform_timer(_g)) > > static inline bool is_timer_block(void *platform_timer) > @@ -157,6 +163,7 @@ int __init acpi_gtdt_init(struct acpi_table_header *table, > { > void *platform_timer; > struct acpi_table_gtdt *gtdt; > + int cnt = 0; > > gtdt = container_of(table, struct acpi_table_gtdt, header); > acpi_gtdt_desc.gtdt = gtdt; > @@ -176,12 +183,16 @@ int __init acpi_gtdt_init(struct acpi_table_header *table, > return 0; > } > > - platform_timer = (void *)gtdt + gtdt->platform_timer_offset; > - if (platform_timer < (void *)table + sizeof(struct acpi_table_gtdt)) { > + acpi_gtdt_desc.platform_timer = (void *)gtdt + gtdt->platform_timer_offset; > + for_each_platform_timer(platform_timer) > + cnt++; > + > + if (cnt != gtdt->platform_timer_count) { > + acpi_gtdt_desc.platform_timer = NULL; > pr_err(FW_BUG "invalid timer data.\n"); > return -EINVAL; > } > - acpi_gtdt_desc.platform_timer = platform_timer; > + > if (platform_timer_count) > *platform_timer_count = gtdt->platform_timer_count; > > -- > 2.20.1 >