From owner-dev-commits-src-all@freebsd.org Wed Jul 21 15:32:27 2021 Return-Path: Delivered-To: dev-commits-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 4321E665649; Wed, 21 Jul 2021 15:32:27 +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 4GVKMb17D0z3FFs; Wed, 21 Jul 2021 15:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0DBB320B9B; Wed, 21 Jul 2021 15:32:27 +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 16LFWQ0n025292; Wed, 21 Jul 2021 15:32:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16LFWQjo025280; Wed, 21 Jul 2021 15:32:26 GMT (envelope-from git) Date: Wed, 21 Jul 2021 15:32:26 GMT Message-Id: <202107211532.16LFWQjo025280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 2ae65d449fec - main - Revert "Fix race between first rand(3) calls." MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ae65d449fecf22f493ce2dcb9e293bb8d95c8ef Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2021 15:32:27 -0000 The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=2ae65d449fecf22f493ce2dcb9e293bb8d95c8ef commit 2ae65d449fecf22f493ce2dcb9e293bb8d95c8ef Author: Alexander Motin AuthorDate: 2021-07-21 14:50:14 +0000 Commit: Alexander Motin CommitDate: 2021-07-21 15:32:22 +0000 Revert "Fix race between first rand(3) calls." It is going to be reimplemented with _once(). This reverts commit 28d70deaafa62c5d1602de5272c0aad0fcca8aff. MFC after: 1 month --- lib/libc/stdlib/rand.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c index 353f59349e1d..bddb0f040302 100644 --- a/lib/libc/stdlib/rand.c +++ b/lib/libc/stdlib/rand.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "un-namespace.h" #include "random.h" @@ -69,15 +68,11 @@ static struct __random_state *rand3_state; static void initialize_rand3(void) { - struct __random_state *state; int error; - state = allocatestate(TYPE_3); - error = initstate_r(state, 1, state->rst_randtbl, BREAK_3); + rand3_state = allocatestate(TYPE_3); + error = initstate_r(rand3_state, 1, rand3_state->rst_randtbl, BREAK_3); assert(error == 0); - if (!atomic_cmpset_rel_ptr((volatile uintptr_t *)&rand3_state, - (uintptr_t)NULL, (uintptr_t)state)) - free(state); } int