From nobody Fri Jul 18 20:33:36 2025 X-Original-To: dev-commits-src-main@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 4bkM2B3K1Gz62lFr; Fri, 18 Jul 2025 20:33:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bkM286yhQz4JSt; Fri, 18 Jul 2025 20:33:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752870817; 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=cQZAYJAIxi1UtuZcqWoLoFwen9QJjNyO01MZz6WibxU=; b=rGJLWJuGS843Emq/+fBvnLLfU3XEFyVPaPz1GnKNdUWhGOLydoNzL+ssjezOy77GPcXd4A tuxtpeL9NkVRJ5/cVtqQcrl2R5n2v9ywdzQ/sByDRcoCwpYFxqAwTtFbHP4rgE5MPXraj7 3DrfdJVIiA4cqRdf6oiII655orCRlGnCU/QI2DYVbWElGTmRgTUrl4mhKK0i0vVVxuKvBx TqHTcdA+1s+fgWP4ssmiTL/lQaphzdQWYFM6JxwIFNrbNMJB0wUIBEyQJslk5vJk8LHmoT wBHnyWCNXEGyYjkZaBQsqs0AKcZ7sczI8cbDTK1PrUmpARHZOa6F4rt3XqV4vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752870817; 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=cQZAYJAIxi1UtuZcqWoLoFwen9QJjNyO01MZz6WibxU=; b=Da37B2yxHUa+TyFTt3xTdIKbZqLBkuZy7Q2Yd/hGmF1nykE00etm2mkB/XxwUyO+bdOowt ZpIcR1bOW6RiWz5pTHO0zlN+yJgYHQBJaA1JFJiSxfx6z3HBD5+UrMvurre+kytzqnUc3Q W2fL9LNUTd6Q1rzxmIpH4NGDcjSpQULvCuotZLAYHZa94/SuufvPdV4Cr/UVhO/f4X8F8p a7biwXgyWnfIDP4wyzL1sdOnip7ZiYW7YaLz3KGiy6eVXDLVpby2t57bOMtGG8aKiZwBd+ gp2rCJ6AC9fnzzIA5KJCORM8bIo31LIPfgt8NQahCuIeFzSMrG38G/bNAHzWYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752870817; a=rsa-sha256; cv=none; b=Gi27/SA2T4wau8m4bVqKFXPZrtU1/IQA0zEgYUr8gaW76Whed1dQqq4VKvTurqrHwWFZwm 4V8o6zxtqa6eW0AWHiLDjCHjuNNrzfn5bBKWSsrYGZKKDhIeXdIn8HRn9ZwcT3j5Kf4Ifx JU2TVUOgBlfHbJWvOCM3g3xGFZIL9yB0zA+CR8g/Vo6ltLyyR2vV5yXCyugAGsQK58ytJ2 BxJMbdY3UPzwULA1wfxJc9gcb82DqNU96CsBBkmm3h2lC+v0vZ3J+qM8o9qASA/hv2StpT 1ZZBV4yI2LiM+D5EEMn9UH8qAcKmGGOKbQDfqmp49ZjiNoZ0WyLv6IWVuGDCUA== 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 4bkM286LkPzwNp; Fri, 18 Jul 2025 20:33:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56IKXa2r050201; Fri, 18 Jul 2025 20:33:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56IKXaVF050198; Fri, 18 Jul 2025 20:33:36 GMT (envelope-from git) Date: Fri, 18 Jul 2025 20:33:36 GMT Message-Id: <202507182033.56IKXaVF050198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fa8db724ae6e - main - random: Treat writes to /dev/random as separate from /entropy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa8db724ae6ea301830ceaea9f37c28016c2d14a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fa8db724ae6ea301830ceaea9f37c28016c2d14a commit fa8db724ae6ea301830ceaea9f37c28016c2d14a Author: Mark Johnston AuthorDate: 2025-07-18 20:23:09 +0000 Commit: Mark Johnston CommitDate: 2025-07-18 20:33:06 +0000 random: Treat writes to /dev/random as separate from /entropy RANDOM_CACHED is overloaded to refer both to entropy obtained from files loaded by the boot loader, and entropy obtained via writes to /dev/random. Introduce a new source, RANDOM_RANDOMDEV, to refer to the latter. This is to enable treating RANDOM_CACHED as a special case in the NIST health test implementation. Update the default harvest_mask in rc.conf to include RANDOM_RANDOMDEV, preserving the old behaviour of accepting writes to /dev/random. Bump __FreeBSD_version for modules which register a pure source, since all of their values have now shifted. Reviewed by: cem MFC after: 3 months Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51155 --- libexec/rc/rc.conf | 2 +- sys/dev/random/random_harvestq.c | 3 ++- sys/dev/random/randomdev.c | 2 +- sys/sys/random.h | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 00f4b718bfad..d502361eca37 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -694,7 +694,7 @@ entropy_file="/entropy" # Set to NO to disable late (used when going multi-user) entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron. entropy_save_sz="4096" # Size of the entropy cache files. entropy_save_num="8" # Number of entropy cache files to save. -harvest_mask="511" # Entropy device harvests all but the very invasive sources. +harvest_mask="4607" # Entropy device harvests all but the very invasive sources. # (See 'sysctl kern.random.harvest' and random(4)) osrelease_enable="YES" # Update /var/run/os-release on boot (or NO). osrelease_file="/var/run/os-release" # File to update for os-release. diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 29d4cd4d6857..c7762967c4fb 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -588,7 +588,8 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_SWI] = "SWI", [RANDOM_FS_ATIME] = "FS_ATIME", [RANDOM_UMA] = "UMA", - [RANDOM_CALLOUT] = "CALLOUT", /* ENVIRONMENTAL_END */ + [RANDOM_CALLOUT] = "CALLOUT", + [RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */ [RANDOM_PURE_OCTEON] = "PURE_OCTEON", /* PURE_START */ [RANDOM_PURE_SAFE] = "PURE_SAFE", [RANDOM_PURE_GLXSB] = "PURE_GLXSB", diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 9d1c7b1167c8..ced4dd8067d9 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -312,7 +312,7 @@ randomdev_accumulate(uint8_t *buf, u_int count) for (i = 0; i < RANDOM_KEYSIZE_WORDS; i += sizeof(event.he_entropy)/sizeof(event.he_entropy[0])) { event.he_somecounter = random_get_cyclecount(); event.he_size = sizeof(event.he_entropy); - event.he_source = RANDOM_CACHED; + event.he_source = RANDOM_RANDOMDEV; event.he_destination = destination++; /* Harmless cheating */ memcpy(event.he_entropy, entropy_data + i, sizeof(event.he_entropy)); p_random_alg_context->ra_event_processor(&event); diff --git a/sys/sys/random.h b/sys/sys/random.h index 254ba9451d0a..5abf762cd200 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -85,7 +85,8 @@ enum random_entropy_source { RANDOM_FS_ATIME, RANDOM_UMA, /* Special!! UMA/SLAB Allocator */ RANDOM_CALLOUT, - RANDOM_ENVIRONMENTAL_END = RANDOM_CALLOUT, + RANDOM_RANDOMDEV, + RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV, /* Fast hardware random-number sources from here on. */ RANDOM_PURE_START, RANDOM_PURE_OCTEON = RANDOM_PURE_START,