Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3120945rwb; Mon, 15 Aug 2022 18:37:59 -0700 (PDT) X-Google-Smtp-Source: AA6agR6xtwRFjcKfZN//E2zFRQOJ7Eluu/QpEuq48vGvNMCWGXIpCh/aG49gMjPRASqLhjf12GsC X-Received: by 2002:a17:902:d58b:b0:16d:c9ff:3c26 with SMTP id k11-20020a170902d58b00b0016dc9ff3c26mr1229405plh.10.1660613879570; Mon, 15 Aug 2022 18:37:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660613879; cv=none; d=google.com; s=arc-20160816; b=qBf3QjS5+4Ea2KQqvtw86VHhAOjOygNmiJ/4vkCGTrbP8E/3GTwarW2ep8YVqiLhb9 VT8v5nGLtOlnblCTM8rSUlPO94PqGRma8rU42PYirgEcJDq2BOBVnKDBIG6WOuRrLWqz f6vsOH6EOs2GM7hQwSaEd8QH93bkGEcezMc173T0seu0dWEf5FzoWmPZ4FQVg/l74OXZ mad+DBb3j8Q7POtmc6bgNOn9KjkRY1v64HfVqRB3YvEniH8elL84C43DOhDTaA9uzHXP KWFCRzIFfLNn0Rs252u9XgVSC+XpLICwUqtXSdzyYfFmfXgGbmfHqyUnh4rJMnJr+EBb XKgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PvT+IOr1HxQ3/EdHW4jCJ5UHLgkpP8B6uraiPERc+b0=; b=T1tiMtQ0j4lE9SsX+J6AxlyndUhBOXdA984kFKbjQq4TSF0nrMaYEcWmjvsX5RhpMd N/02JrYRbT6pUoV8+yVtcj+xiLBS4Pb1bXWQou1+D5CNhg5GU5O+0T4kGLLwh5TJdBdA FT11SRGzePmpcIUWWyt6qwbVilGkXF88Flsw7fwtk5W18VO58x9MVOF0KAqiHwk+nU3i oY0kH5GPC1dhJoyRpZVdRRSyv9rSgxgE29nWrJrZuiNtN11cIVNMLyvGmSZefUIcilJQ 2qJZRtD42F9EJR23vRk+6IZ0djDCqjAvmXu3memutwoxUuHXgibK9RYso3FFXnJVtkz6 BvKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RCyoz3fk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j23-20020a17090a841700b001f3e1e8f91fsi11359145pjn.22.2022.08.15.18.37.49; Mon, 15 Aug 2022 18:37:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RCyoz3fk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232142AbiHPA6q (ORCPT + 99 others); Mon, 15 Aug 2022 20:58:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347923AbiHPAv4 (ORCPT ); Mon, 15 Aug 2022 20:51:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E764DA3C1; Mon, 15 Aug 2022 13:47:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 29BF8B8114A; Mon, 15 Aug 2022 20:47:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BFE6C433D6; Mon, 15 Aug 2022 20:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660596430; bh=b36WB6IAy6WVS7Me8ov6v93+IVXEGpv3YEPhTmt49s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RCyoz3fkCNrky7aByoQ+LF6NT2WJu7Hl9kkkG+DrsaF2OL6yVa6EG0dorhcKmXera UPhqOcCAZTZUIL71BHVnWiUBMAwUbZBHX1ReGNlZyGNmq1tUl/KpVevMo3jcIGa6HY V9qUA1PATiyj9dmCpSXpQBtzKI/8UjbqttXyiYuA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Gleixner , Eric Biggers , "Jason A. Donenfeld" , Sasha Levin Subject: [PATCH 5.19 1076/1157] timekeeping: contribute wall clock to rng on time change Date: Mon, 15 Aug 2022 20:07:12 +0200 Message-Id: <20220815180523.167658976@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jason A. Donenfeld [ Upstream commit b8ac29b40183a6038919768b5d189c9bd91ce9b4 ] The rng's random_init() function contributes the real time to the rng at boot time, so that events can at least start in relation to something particular in the real world. But this clock might not yet be set that point in boot, so nothing is contributed. In addition, the relation between minor clock changes from, say, NTP, and the cycle counter is potentially useful entropic data. This commit addresses this by mixing in a time stamp on calls to settimeofday and adjtimex. No entropy is credited in doing so, so it doesn't make initialization faster, but it is still useful input to have. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Reviewed-by: Thomas Gleixner Reviewed-by: Eric Biggers Signed-off-by: Jason A. Donenfeld Signed-off-by: Sasha Levin --- kernel/time/timekeeping.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 8e4b3c32fcf9..f72b9f1de178 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "tick-internal.h" #include "ntp_internal.h" @@ -1343,8 +1344,10 @@ int do_settimeofday64(const struct timespec64 *ts) /* Signal hrtimers about time change */ clock_was_set(CLOCK_SET_WALL); - if (!ret) + if (!ret) { audit_tk_injoffset(ts_delta); + add_device_randomness(ts, sizeof(*ts)); + } return ret; } @@ -2430,6 +2433,7 @@ int do_adjtimex(struct __kernel_timex *txc) ret = timekeeping_validate_timex(txc); if (ret) return ret; + add_device_randomness(txc, sizeof(*txc)); if (txc->modes & ADJ_SETOFFSET) { struct timespec64 delta; @@ -2447,6 +2451,7 @@ int do_adjtimex(struct __kernel_timex *txc) audit_ntp_init(&ad); ktime_get_real_ts64(&ts); + add_device_randomness(&ts, sizeof(ts)); raw_spin_lock_irqsave(&timekeeper_lock, flags); write_seqcount_begin(&tk_core.seq); -- 2.35.1