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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ADD8C7618F for ; Mon, 15 Jul 2019 13:55:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4388217F4 for ; Mon, 15 Jul 2019 13:55:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198940; bh=8SVyqH00Vk+wmUT3hi2IA4kgYubzOzW0NcN+Endh2fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DUez66EVQRzygNCqmkwpWx+BYSk0KJEce4QBv1DSHv24+KdFWpd7ceSTdQQdyZUB9 zQyDYhek6Xr4bssBx7xOE7dNwWY2zAnbtWTWI6rLKcFrLnMGbJzjuOVg3twGw8wa0b 13pupAvEUrLE7uDshJD3Ln3+tNj4DxmpAUBGonO4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732633AbfGONzh (ORCPT ); Mon, 15 Jul 2019 09:55:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:59040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732632AbfGONzh (ORCPT ); Mon, 15 Jul 2019 09:55:37 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 374FC217F9; Mon, 15 Jul 2019 13:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198937; bh=8SVyqH00Vk+wmUT3hi2IA4kgYubzOzW0NcN+Endh2fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KaXr/nnay0sthHgSKYAFiiGlCpH5VkpnVK4EDM5+9UNun6I2tLn9uGkNhT6vFWp09 NK3lKYyeOyBLyJ+r2YxF9+vtqECo0Sbpb+0y/H6YAC/0OPySLyeZfcqKTf3fOF8vOG slI1xCAU4EUki9ZC6jn07D9Bt2yUpG7KzOePx5d8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miroslav Lichvar , Weikang shi , Thomas Gleixner , John Stultz , Prarit Bhargava , Richard Cochran , Stephen Boyd , Sasha Levin Subject: [PATCH AUTOSEL 5.2 146/249] ntp: Limit TAI-UTC offset Date: Mon, 15 Jul 2019 09:45:11 -0400 Message-Id: <20190715134655.4076-146-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Miroslav Lichvar [ Upstream commit d897a4ab11dc8a9fda50d2eccc081a96a6385998 ] Don't allow the TAI-UTC offset of the system clock to be set by adjtimex() to a value larger than 100000 seconds. This prevents an overflow in the conversion to int, prevents the CLOCK_TAI clock from getting too far ahead of the CLOCK_REALTIME clock, and it is still large enough to allow leap seconds to be inserted at the maximum rate currently supported by the kernel (once per day) for the next ~270 years, however unlikely it is that someone can survive a catastrophic event which slowed down the rotation of the Earth so much. Reported-by: Weikang shi Signed-off-by: Miroslav Lichvar Signed-off-by: Thomas Gleixner Cc: John Stultz Cc: Prarit Bhargava Cc: Richard Cochran Cc: Stephen Boyd Link: https://lkml.kernel.org/r/20190618154713.20929-1-mlichvar@redhat.com Signed-off-by: Sasha Levin --- kernel/time/ntp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 8de4f789dc1b..65eb796610dc 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -43,6 +43,7 @@ static u64 tick_length_base; #define MAX_TICKADJ 500LL /* usecs */ #define MAX_TICKADJ_SCALED \ (((MAX_TICKADJ * NSEC_PER_USEC) << NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ) +#define MAX_TAI_OFFSET 100000 /* * phase-lock loop variables @@ -691,7 +692,8 @@ static inline void process_adjtimex_modes(const struct __kernel_timex *txc, time_constant = max(time_constant, 0l); } - if (txc->modes & ADJ_TAI && txc->constant >= 0) + if (txc->modes & ADJ_TAI && + txc->constant >= 0 && txc->constant <= MAX_TAI_OFFSET) *time_tai = txc->constant; if (txc->modes & ADJ_OFFSET) -- 2.20.1