From nobody Mon Feb 14 02:04:13 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5739E19C0CF7; Mon, 14 Feb 2022 02:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jxnb121Vpz4r4d; Mon, 14 Feb 2022 02:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644804253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JS1otpSQhk9dWwnzl3Azozm9kMekEDiZiufscZu9QlA=; b=a0Z1P0qEStGC87fQ5Lwl/TQDB3C0SjvqtsOOGXJfAN/a0NekTzNYco79I4tKt0v1cdIi2L ZeUI7aUUt90UOqH01ju1WXy6e61Ab/Hol9yP7dByTKGg0w8BXMt7FpGEJNit/ICJtQe1OF suLj+MAfwtn2Y7AuPlZbQ/96ohRpVudmQxCyy4+glQsUkFR6yAu+6gU7vDGTh6D3vCKAcB PGUOpD1iT57S3118w5LEALUXGegQaVUIOeTdnOtb9b+kLj9PuMlEZ+0XeYUEoIdZ7Bju2t 0PCNbCeReZCNq9YWiJd92kcjnCQt+SizORTOQoUtd9mBEf799CAbt7Xq6RFnbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 206FC26259; Mon, 14 Feb 2022 02:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21E24Dkm017170; Mon, 14 Feb 2022 02:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21E24Dhr017169; Mon, 14 Feb 2022 02:04:13 GMT (envelope-from git) Date: Mon, 14 Feb 2022 02:04:13 GMT Message-Id: <202202140204.21E24Dhr017169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: 921bb16f82d0 - stable/12 - random(4): deduplicate explicit_bzero() in harvest List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 921bb16f82d050c166d45117d1c4d6e3c03a710b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644804253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JS1otpSQhk9dWwnzl3Azozm9kMekEDiZiufscZu9QlA=; b=kAyGRAeXqwkkSSkK0wdo4Adzt+Niy/4cRMPmCgdQcR78qmW8hSITsGruISZdFxsp86MGDB Gd2rDdweYwiSxUeTvLgekvrT7A9ekszzlDAqVh+gl4YUmTijlGo6E8I99K87rnHb6LHMfx 0GpqF5dhCngrUHl2hLfduh4cVjq/JvU1BmLXsfJw3bt7Jtd5TPQd7O3SpQ99RPsJhICYhr gLCrU5QKwJ6yVrielcjq2IGIrYojygniqotzLwx1Z4BqqU18w9foLggoGsWdkLn+qepau0 or0M2hswv0hhLU7ycbNkl+o6wctrINFWJP7QPRun7+CM5WKnC29AnnMH2dql8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644804253; a=rsa-sha256; cv=none; b=kxLVvuXPvw1ctKHAKeCkBe+gkfKAN1h4U3RdH14jp7T9KLX1UlLLNHS5GS3cfOt2+dn63C L7rRqIX3BHWyW/9bYjLlVzGsOnjlGSC63aQbNyiEfcJqTtD/8/GaT5dAy+2SGgIiUSGRuy ZEU607SzvqAkK9wZbrKPAHKi8hGtvZb8Mv0RdrDUlV0reuHD/lJ9wJGf3j+V5ySCyLHKP1 sopOtPggW8VCe7aISnATVnophjnXShSwINXEMBb3XgbxOpvtpk/lFcBv1mbrv62pTJNTt+ IYaKQ4ZVdjEiHaCLSqFg3hS2Llch9ynsi+f2hDsKODHv+nY73+5sNKI3TyCXMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=921bb16f82d050c166d45117d1c4d6e3c03a710b commit 921bb16f82d050c166d45117d1c4d6e3c03a710b Author: Conrad Meyer AuthorDate: 2019-05-23 21:02:27 +0000 Commit: David E. O'Brien CommitDate: 2022-02-14 02:01:48 +0000 random(4): deduplicate explicit_bzero() in harvest Pull the responsibility for zeroing events, which is general to any conceivable implementation of a random device algorithm, out of the algorithm-specific Fortuna code and into the callers. Most callers indirect through random_fortuna_process_event(), so add the logic there. Most callers already explicitly bzeroed the events they provided, so the logic in Fortuna was mostly redundant. Add one missing bzero in randomdev_accumulate(). Also, remove a redundant bzero in the same function -- randomdev_hash_finish() is obliged to bzero the hash state. Reviewed by: delphij Approved by: secteam(delphij) Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D20318 (cherry picked from commit 00e0e488a023967ad9a650f64cb4d77ec83a812d) --- sys/dev/random/fortuna.c | 1 - sys/dev/random/random_harvestq.c | 3 +-- sys/dev/random/randomdev.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/random/fortuna.c b/sys/dev/random/fortuna.c index e0991d411df3..b0ab6e88c69e 100644 --- a/sys/dev/random/fortuna.c +++ b/sys/dev/random/fortuna.c @@ -254,7 +254,6 @@ random_fortuna_process_event(struct harvest_event *event) fortuna_state.fs_pool[pl].fsp_length = MIN(RANDOM_FORTUNA_MAXPOOLSIZE, fortuna_state.fs_pool[pl].fsp_length + sizeof(event->he_somecounter) + event->he_size); - explicit_bzero(event, sizeof(*event)); RANDOM_RESEED_UNLOCK(); } diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 3cd82571ebc0..d681204832a5 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -152,6 +152,7 @@ random_harvestq_fast_process_event(struct harvest_event *event) #if defined(RANDOM_LOADABLE) RANDOM_CONFIG_S_UNLOCK(); #endif + explicit_bzero(event, sizeof(*event)); } static void @@ -414,7 +415,6 @@ random_harvestq_prime(void *unused __unused) harvest_context.hc_destination[RANDOM_CACHED]++; memcpy(event.he_entropy, data + i, sizeof(event.he_entropy)); random_harvestq_fast_process_event(&event); - explicit_bzero(&event, sizeof(event)); } explicit_bzero(data, size); if (bootverbose) @@ -517,7 +517,6 @@ random_harvest_direct_(const void *entropy, u_int size, enum random_entropy_sour event.he_destination = harvest_context.hc_destination[origin]++; memcpy(event.he_entropy, entropy, size); random_harvestq_fast_process_event(&event); - explicit_bzero(&event, sizeof(event)); } void diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 9e2ddb29ce0b..e20669b3c207 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -321,7 +321,6 @@ randomdev_accumulate(uint8_t *buf, u_int count) timestamp = (uint32_t)get_cyclecount(); randomdev_hash_iterate(&hash, ×tamp, sizeof(timestamp)); randomdev_hash_finish(&hash, entropy_data); - explicit_bzero(&hash, sizeof(hash)); for (i = 0; i < RANDOM_KEYSIZE_WORDS; i += sizeof(event.he_entropy)/sizeof(event.he_entropy[0])) { event.he_somecounter = (uint32_t)get_cyclecount(); event.he_size = sizeof(event.he_entropy); @@ -330,6 +329,7 @@ randomdev_accumulate(uint8_t *buf, u_int count) memcpy(event.he_entropy, entropy_data + i, sizeof(event.he_entropy)); p_random_alg_context->ra_event_processor(&event); } + explicit_bzero(&event, sizeof(event)); explicit_bzero(entropy_data, sizeof(entropy_data)); }