From owner-svn-src-all@freebsd.org Tue Mar 17 22:27:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C2A6A274449; Tue, 17 Mar 2020 22:27:18 +0000 (UTC) (envelope-from cem@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48hnpt1PYMz4fZ7; Tue, 17 Mar 2020 22:27:18 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EAC7183B8; Tue, 17 Mar 2020 22:27:17 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02HMRHsn086024; Tue, 17 Mar 2020 22:27:17 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02HMRHLM086023; Tue, 17 Mar 2020 22:27:17 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202003172227.02HMRHLM086023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Tue, 17 Mar 2020 22:27:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359053 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 359053 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Mar 2020 22:27:18 -0000 Author: cem Date: Tue Mar 17 22:27:16 2020 New Revision: 359053 URL: https://svnweb.freebsd.org/changeset/base/359053 Log: Implement sysctl kern.boot_id Boot IDs are random, opaque 128-bit identifiers that distinguish distinct system boots. A new ID is generated each time the system boots. Unlike kern.boottime, the value is not modified by NTP adjustments. It remains fixed until the machine is restarted. PR: 244867 Reported by: Ricardo Fraile MFC after: I do not intend to, but feel free Modified: head/sys/kern/kern_mib.c Modified: head/sys/kern/kern_mib.c ============================================================================== --- head/sys/kern/kern_mib.c Tue Mar 17 21:29:03 2020 (r359052) +++ head/sys/kern/kern_mib.c Tue Mar 17 22:27:16 2020 (r359053) @@ -448,6 +448,32 @@ SYSCTL_PROC(_kern, KERN_HOSTID, hostid, CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE | CTLFLAG_CAPRD, NULL, 0, sysctl_hostid, "LU", "Host ID"); +static struct mtx bootid_lk; +MTX_SYSINIT(bootid_lock, &bootid_lk, "bootid generator lock", MTX_DEF); + +static int +sysctl_bootid(SYSCTL_HANDLER_ARGS) +{ + static uint8_t boot_id[16]; + static bool initialized = false; + + mtx_lock(&bootid_lk); + if (!initialized) { + if (!is_random_seeded()) { + mtx_unlock(&bootid_lk); + return (ENXIO); + } + arc4random_buf(boot_id, sizeof(boot_id)); + initialized = true; + } + mtx_unlock(&bootid_lk); + + return (SYSCTL_OUT(req, boot_id, sizeof(boot_id))); +} +SYSCTL_PROC(_kern, OID_AUTO, boot_id, + CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_CAPRD, + NULL, 0, sysctl_bootid, "", "Random boot ID"); + /* * The osrelease string is copied from the global (osrelease in vers.c) into * prison0 by a sysinit and is inherited by child jails if not changed at jail