From nobody Fri Feb 11 05:54:51 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 2570319C59AF; Fri, 11 Feb 2022 05:54:52 +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 4Jw2rX09Zzz4WPB; Fri, 11 Feb 2022 05:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644558892; 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=3UvNeIyO1PMF5CY0deO3EKb6kMTgRatT+OYVeIBgIZ8=; b=wGPyQxc++BY2cnM/6BG5FuRBnITZ45h2uyNow7Z9oDgDGUbQeBog6zPahbXUCXzuetPYrO MZEDNsD7Q+Df3HEogtEH+SUXhJuxOrBgd23DR7vMIE+WCC0mUn26ixtKldjMc/04PiRq7j VV2/8lZPh849UTCqeOmg34O7jI3EPqkgXykUg6iEhwzudpfAEg8pmFYdoz+SVUbJeguwI1 loiXej7qIZ2MMTpfIjzLb/FRc5Gy3Cr9bMdfPxQirbeX8KxSUnDWu1Fh7X5YxAc5bOQikq pIZx75xJhJXctXCHtD5jHNe/nI1Gqcm1xjb3TmKp1flYa0NFJrRm9HOUeTnTqw== 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 D5FA76CC6; Fri, 11 Feb 2022 05:54:51 +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 21B5spgv051061; Fri, 11 Feb 2022 05:54:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21B5spJ1051060; Fri, 11 Feb 2022 05:54:51 GMT (envelope-from git) Date: Fri, 11 Feb 2022 05:54:51 GMT Message-Id: <202202110554.21B5spJ1051060@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: 8f746f7e88d2 - stable/12 - random(4): Correct a bare zero to the appropriate enum 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: 8f746f7e88d2edc3d2f4e9814300c8b815e7335b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644558892; 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=3UvNeIyO1PMF5CY0deO3EKb6kMTgRatT+OYVeIBgIZ8=; b=wK1BhbiiQYdZLKOB85Ah5ouYg9ngc7RQOsqfSBHE/u85Ypf6RbpWr/21X+gcyrfkjTDOAn kn5+AarMbmscr0BB9CNFcB/Ehi2Pubmy3lgajBrsiY4VJmTFrLYvP3MnR26q0ixK0iIXON ceSjTYItAWsdgV4O96QYGrEOTuAnhoHlECMpGgP40K3GdF0VPRINE6MWUpHopU0pSXlZ/f Ymzph7lovySJ3oxv/vt01jWAI9NWFl8Qr5XAADNbPqO2V6usArdMjrdjSKXfX4Q5rzBTQs U249Bb2NFrDehY35SgVP5mn+JOpf/yaZLmYiMQABSWjAXXXCEBdwiGXWzHbxkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644558892; a=rsa-sha256; cv=none; b=CECv5GfgWHXYf0r7IgySNVPEQ8B8YjPHNSwUICAmIR4v0nYlne94twLSet/9HVlLFmOhBI KiOvjoZ0zXjHfBh/4HxCOejGstMjLtpqsEejMIkrA5nHDSYvg7D+Jwij7VA943KNuDAaPE Re1UYoCkTG6qJBPucbVPo1R/JnS3zRwXYCm3f2v8Zeg2k9Dof1LSO3YoxmT/WRGHS+BZ/A QVv14B4mBP68zMvDVQKESBjfjSlBSEXTM9mR2fr+gLLvYfqFW0zFakBkPrcGXUpm51/Tuo o5siSQAUmlWRuaAAVMeU8phKHvD9MygPtj4354SS13R+5f6EIwgHCo3CUHyAaA== 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=8f746f7e88d2edc3d2f4e9814300c8b815e7335b commit 8f746f7e88d2edc3d2f4e9814300c8b815e7335b Author: Conrad Meyer AuthorDate: 2018-10-20 21:06:15 +0000 Commit: David E. O'Brien CommitDate: 2022-02-11 05:36:12 +0000 random(4): Correct a bare zero to the appropriate enum The convention for updating hc_destination[] is to index with a random_entropy_source. Zero happens to match RANDOM_CACHED, which is correct for this source (early random data). Spell the zero value as the enum name instead of the magic constant. No functional change. (cherry picked from commit 93d587e4d0442c7e702995b53668081240eefba2) --- sys/dev/random/random_harvestq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 227000983e1e..c040649c17b2 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -415,7 +415,8 @@ random_harvestq_prime(void *unused __unused) event.he_somecounter = (uint32_t)get_cyclecount(); event.he_size = count; event.he_source = RANDOM_CACHED; - event.he_destination = harvest_context.hc_destination[0]++; + event.he_destination = + 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));