From nobody Mon Dec 29 17:07:17 2025 X-Original-To: dev-commits-src-all@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 4dg2hQ5Yshz6M3Vl for ; Mon, 29 Dec 2025 17:07:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hP731sz473c for ; Mon, 29 Dec 2025 17:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028038; 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=syX97FnSp3rX8eRuonVXIUS4wjwc/mDfLMrubjs+6h8=; b=vWoRI7c5MgIZnNkD6cY9G0oCF5Eejug/c6fxEnlACbEMEU4xW1nnSwxz2mAQGXiPsH+6ya ogNsh6dZ7bs2s1Re3v49KUyXHQaXFX1qfFBGGbX+6hfn9nx9jFF1IuEET7k2XUkrnY0382 Bg7lbjl24eyU7nHcl/v55ypd+O6eeIkKz5lOOdYOETBuKOy/lTKHaz30G+8Rn3qKQPMyaM h6lLq9880nf/xI8lF81perMsgpk3ihySGF7UCLzOOzb+8iLTHvFhCuv5Z66XcGiKSCtHlK YcQxwQkAZND+PBEyt2y5dOZjS+T9p92PRmhNl1uVA3dAQNsw3BsC6XdrbWHBlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028038; 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=syX97FnSp3rX8eRuonVXIUS4wjwc/mDfLMrubjs+6h8=; b=naai77rxmXHZNarwTE7X9sMHzPocgB/bELe+UWDHYA4uEbMxQ98J82n0fmTYbzclM7qWOX sN0gSMAz3/9WV9Gd/e/CsFNvA0xugFqjCoomWlzHps1blGvYfNgtxEJ/oLTzFqwTE7+6ad 6KzbGFdXzukPUoVlkak3oRKDAVnotYb8bO+pFbvgz39mEq6rQanqmaV6maCHlSw5GpIAT5 2E8uelcJgb8t/pBlFz7ClSJuNSUA+m+AR/qy1XAyvRe/WabgikFGM+05qyNiOsh0KvRlAH wJaeJb6QH6Dvw/xRZjvDm5uvZd0GbCFxk543horgkSQBJPSWzG6KS5fOGOesbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028038; a=rsa-sha256; cv=none; b=JdzDl6bMyLG1nFU0/+bTCjPzEhAVpiRIrMjGYSY0HfQtbaLqw5RWZkuPh+fo84At56GfyD +qN13fazF4OoBvPokI/wM3U9PLSGnc+5wcDMMxucbS9z4piRM/bxnhVTqzU3NcDgjgkV+L 7df1+J9PxU2+DoPzSikriRaIXyHaZD61Z1R5X/s4bVjJI3jlpHYyeu/bIG3/XxHXOB5sjl YLonU9sibgreyAUkU7cdEDYD/nZ+rrXQUQKV3PGHs0HKw0XJTM7FrffwCsqJDkQ1h6sDTr CYNtaZb8VsYNaNbouB83pLEMvJILWAHt+CfwPMqSxQG7Qd80P/6Jz+B4J++CSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hP6ckrz7mJ for ; Mon, 29 Dec 2025 17:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 255a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 108e4f31420d - stable/15 - armv8rng: Fix an inverted test in random_rndr_read_one() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: 108e4f31420d8c765d883afaece49a782d35943d Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:17 +0000 Message-Id: <6952b545.255a5.3550ef2@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=108e4f31420d8c765d883afaece49a782d35943d commit 108e4f31420d8c765d883afaece49a782d35943d Author: Mark Johnston AuthorDate: 2025-12-18 14:17:20 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:50:34 +0000 armv8rng: Fix an inverted test in random_rndr_read_one() If we get a random number, the NZCV is set to 0b0000. Then "cset %w1, ne" will test whether Z == 0 and set %w1 to 1 if so. More specifically, "cset %w1, ne" maps to "csinc %w1, wzr, wzr, eq", which stores 0 in %w1 when NZCV == 0b0100 and 1 otherwise. Thus, on a successful read we expect ret != 0, so the loop condition needs to be fixed. In practice this means that we would end up trying to fetch entropy up to ten times in a row. If all attempts are successful, the last will be returned, otherwise no entropy will be returned. Reported by: Kevin Day Reviewed by: andrew Fixes: 9eecef052155 ("Add an Armv8 rndr random number provider") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54259 (cherry picked from commit 93811883500b99f9f1fb4ffd6e764226d37dcfd0) --- sys/dev/random/armv8rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c index 524d80317681..9573c09aa77a 100644 --- a/sys/dev/random/armv8rng.c +++ b/sys/dev/random/armv8rng.c @@ -64,7 +64,7 @@ random_rndr_read_one(u_long *buf) /* 1 on success, 0 on failure */ "cset %w1, ne\n" : "=&r" (val), "=&r"(ret) :: "cc"); - } while (ret != 0 && --loop > 0); + } while (ret == 0 && --loop > 0); if (ret != 0) *buf = val;