From nobody Wed May 08 13:07:50 2024 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 4VZFn25SyMz5J5t2; Wed, 08 May 2024 13:07:50 +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 4VZFn241Sqz4Rbn; Wed, 8 May 2024 13:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715173670; 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=iSvlP3FD8U7fe1qGCTM7ISszpDVCqyEFkDSeZEKcO2A=; b=GirbNzcnXRVt4Uux65kVvS54IA2ngmXtSfC4g1eMBh1t8RzZDT4Kavzlk3NKlVgQesIvJQ XxSeqCXEnLjEeF014m1R+mkND6y6DM6qql60wG+4dtJD61grJZf46jfXYJdJ0nK53SOFMQ vES5/z/1eR2nWSdgdRb4tMl3aAHK4NEYg+S/oNexf1Z9cDAlngZZ5VHCcE8gXRQ8fZe8Eu JyZTfxqbCiFh40spImtWzoH4g3+qLICkLhZCyPlkletZUFGBe0Jk/4U1mRSUiZoRzK0kal YXDAIwvmTgZFkvZl/LMbvIotej2oPmBzu9UYPXZzQ5nwp1kHRqxoFN9c2JtYpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715173670; a=rsa-sha256; cv=none; b=KHYpy8VuNnvp3XVNt/Ip9nX7q/IJAAEYonsWmOyp9I46k2C529UQCl3oR+WjdTAcB8YCHC AyHEwJjLkHT851dUiRCrY6el2njPB0eCnwVkcox3P999n2TuuYXhGBBBnFKgpbhKBJhz1R kLMX68x/7JaWkUMJMxAQXnXYFFJMKXEegYqv8ZWECvlJccHGHsCg4idS6SzP6YPFwnxK6X xTYQbXVZKIboekpT2ekueZZswgZ3twusIPI17YpP68n+K8Rq74R3oC5GhGBlGtmZyWTpgk tYG4FLKQG0JsLWN8GHpWoJAeEDdGmfrgfgHZ+YjG/DAE90D+8c7l9gtfXe54pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715173670; 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=iSvlP3FD8U7fe1qGCTM7ISszpDVCqyEFkDSeZEKcO2A=; b=QR6QYJkeWW1LfFBlZy4TDTikvfOiXZ5GHri79n8ILJDskOC26FlhnHragua8EdvXsbO4jl SNraTVK4EvGhb7R4Ucno7VfcdfRfNDO84ljssxa6SSsJyE4EjfZKZ9GdhY1yqFIwWRp/kP mV5Bzmlxfs6aj0Cv1cj0Fo+HG9FRpWOZQeeZH2HyEpnJc7rhJ1SSSUh58u85Spqp/jZJ7/ QiKTJZiGFBBk17cNkVQ5Yev25kQDrudbQEyUFp9bplq4pElCMMZp3K3+qPIil3bGz24OFJ pWRvJnSkEZD4lCuRWrsoeDEBg/ODh0TleXC+bUwcWJ5DkdErVyGBg5EqBLkwRw== 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 4VZFn23dXbzQpt; Wed, 8 May 2024 13:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 448D7oUO080527; Wed, 8 May 2024 13:07:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 448D7oXX080524; Wed, 8 May 2024 13:07:50 GMT (envelope-from git) Date: Wed, 8 May 2024 13:07:50 GMT Message-Id: <202405081307.448D7oXX080524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f4ab464d3492 - stable/14 - ng_pipe: Replace deprecated random() with prng32_bounded() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f4ab464d3492c8ad6d3d0a4851e382e40d438a19 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f4ab464d3492c8ad6d3d0a4851e382e40d438a19 commit f4ab464d3492c8ad6d3d0a4851e382e40d438a19 Author: Martin Vahlensieck AuthorDate: 2024-04-17 18:59:22 +0000 Commit: Mark Johnston CommitDate: 2024-05-08 13:06:16 +0000 ng_pipe: Replace deprecated random() with prng32_bounded() Signed-off-by: Martin Vahlensieck MFC after: 2 weeks Reviewed by: markj Pull Request: https://github.com/freebsd/freebsd-src/pull/1181 (cherry picked from commit a3ecf8c7863683e53c77a17f96ab7012352265b9) --- sys/netgraph/ng_pipe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c index 7afaf24f5914..d368c142b1ab 100644 --- a/sys/netgraph/ng_pipe.c +++ b/sys/netgraph/ng_pipe.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -771,7 +772,7 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) { * the original packet... */ if (hinfo->cfg.duplicate && - random() % 100 <= hinfo->cfg.duplicate) { + prng32_bounded(100) <= hinfo->cfg.duplicate) { ngp_h = uma_zalloc(ngp_zone, M_NOWAIT); KASSERT(ngp_h != NULL, ("ngp_h zalloc failed (3)")); m = m_dup(m, M_NOWAIT); @@ -814,7 +815,7 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) { /* Randomly discard the frame, according to BER setting */ if (hinfo->cfg.ber) { oldrand = rand; - rand = random(); + rand = prng32_bounded(1U << 31); if (((oldrand ^ rand) << 17) >= hinfo->ber_p[priv->overhead + m->m_pkthdr.len]) { hinfo->stats.out_disc_frames++;