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 31CD5C54735 for ; Tue, 27 Aug 2024 10:18:14 +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:Content-Type: Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:CC:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=QSOzToFe3VsIvYXRK9kk0KZjv46qYSFsNGD5tA0zwBE=; b=P/L/VtJc4N8mzL3CccM58O+j5u MDWQ2DcODgGLKAHSfNe/erhOFBcomclC9RwWTGPCWqBN4f1a1qY+u7gfUhYPzaCViXSG+GYTPJ22E gUErPiQO0ofOYQ77USA6fc+VIHh4mPHo0z5AdRZy/UEB+Z9ZeEZgQOIiI9H+ukXS/7QJ0c9rT8Boy a9mLXx3MmmcmnG1NNgnzYuCgpsDw5fwdXp9z0HsYrKvP7NTWPIMvXdXsrHerc7BstzHWuL4KIO2Sm hPGKHNDtLKIcKJ7Y2/5gLxGjIbRiiCi4hddgdr3P00WVRwwQkQxE0upCZulfWIsAPgKcF/2OZnTD6 hZQRqOMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sitGy-0000000AmKY-3FBq; Tue, 27 Aug 2024 10:18:00 +0000 Received: from mx1.t-argos.ru ([109.73.34.58]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sitG8-0000000Am34-1qVZ for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2024 10:17:10 +0000 Received: from mx1.t-argos.ru (localhost [127.0.0.1]) by mx1.t-argos.ru (Postfix) with ESMTP id E490C100004; Tue, 27 Aug 2024 13:15:57 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t-argos.ru; s=mail; t=1724753757; bh=QSOzToFe3VsIvYXRK9kk0KZjv46qYSFsNGD5tA0zwBE=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=A7dVKZS7+2yVR/bzZe4RLJa0zF2t2fBDuwO9fTxxYQBWscv18dnZaNNHry3E4FqdG uTtdXyx7H3CpUK2qwdt3gi/IjXovFDme97KK5tBsLbPMR/wR+XFVdkhabjIA3qs1AP cMB8jDF1ygqiVlfJ8qxyq8ww13Kcb2cEV9NiuwCAfIN/VcXdfMMomEPU7T9edj6fQu nXDZrrJbLUAPHjIlW1GBBm5s6eYgopsEdQM/80pdyRCsYjDoEXL93zFLWyE079cV2i 9OWBbJL8TTDib4NioRIuw+Zrqy8zp2wYwv/+QR11n07AV5eglEGq/tnYwXp3tH8VAr 051jD1hxUOQXw== Received: from mx1.t-argos.ru.ru (mail.t-argos.ru [172.17.13.212]) by mx1.t-argos.ru (Postfix) with ESMTP; Tue, 27 Aug 2024 13:13:16 +0300 (MSK) Received: from Comp.ta.t-argos.ru (172.17.44.124) by ta-mail-02 (172.17.13.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 27 Aug 2024 13:12:55 +0300 From: Aleksandr Mishin To: Fu Wei CC: Aleksandr Mishin , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , "Rafael J. Wysocki" , Len Brown , Mark Rutland , , , , Subject: [PATCH] acpi/arm64: Adjust error handling procedure in gtdt_parse_timer_block() Date: Tue, 27 Aug 2024 13:12:39 +0300 Message-ID: <20240827101239.22020-1-amishin@t-argos.ru> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.17.44.124] X-ClientProxiedBy: ta-mail-02.ta.t-argos.ru (172.17.13.212) To ta-mail-02 (172.17.13.212) X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 187358 [Aug 27 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 27 0.3.27 71302da218a62dcd84ac43314e19b5cc6b38e0b6, {Tracking_from_domain_doesnt_match_to}, mx1.t-argos.ru.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;t-argos.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/08/27 07:21:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/08/27 08:02:00 #26443905 X-KSMG-AntiVirus-Status: Clean, skipped X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_031709_025468_C1B892FF X-CRM114-Status: GOOD ( 13.16 ) 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 In case of error in gtdt_parse_timer_block() invalid 'gtdt_frame' will be used in 'do {} while (i-- >= 0 && gtdt_frame--);' statement block because do{} block will be executed even if 'i == 0'. Adjust error handling procedure by replacing 'i-- >= 0' with 'i-- > 0'. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: a712c3ed9b8a ("acpi/arm64: Add memory-mapped timer support in GTDT driver") Signed-off-by: Aleksandr Mishin --- drivers/acpi/arm64/gtdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c index c0e77c1c8e09..eb6c2d360387 100644 --- a/drivers/acpi/arm64/gtdt.c +++ b/drivers/acpi/arm64/gtdt.c @@ -283,7 +283,7 @@ static int __init gtdt_parse_timer_block(struct acpi_gtdt_timer_block *block, if (frame->virt_irq > 0) acpi_unregister_gsi(gtdt_frame->virtual_timer_interrupt); frame->virt_irq = 0; - } while (i-- >= 0 && gtdt_frame--); + } while (i-- > 0 && gtdt_frame--); return -EINVAL; } -- 2.30.2