From nobody Tue Feb 15 02:09:26 2022 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 03B3219C35F2; Tue, 15 Feb 2022 02:09: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 4JyPfZ5zQ5z3vJF; Tue, 15 Feb 2022 02:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644890966; 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=YrN4r2SWM2nhRvSttpkSdYqmOPpv3lFrRRGj6DbQkOQ=; b=JROCGI2FXzPM7sfwZSKAldNC+bcvMyBFtnDZ1FVv5RQg3k89gKlF6Bwp1pa+Cix4B32HWo Hs+izx75vpvW3z17LsupBKm0qu6TJIr4GoVB/G7vpedA+QvSHkWANLD0bkNXLtICpOtTie pVxP+7FmacIj8t9vaLvPZLbwQx8Joyws5pu8IkM2UifyF3HLB3nIeYm971NdAy2mkSuQwo HCpHPVjJbAPBtV4ptMJBq1AuJTf95qcgoxC38sckPVlRP2CKhmd360/QAsuIfA5/PsiBwQ SrcirR4KF8R6+jCpC/yOx0uddpmuHFBgTeIRbg2hrevrjrGA0xX6OJTXR6PViw== 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 A948D1A048; Tue, 15 Feb 2022 02:09:26 +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 21F29Qbq046608; Tue, 15 Feb 2022 02:09:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21F29QC9046607; Tue, 15 Feb 2022 02:09:26 GMT (envelope-from git) Date: Tue, 15 Feb 2022 02:09:26 GMT Message-Id: <202202150209.21F29QC9046607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: f3ed4a38b520 - stable/12 - random(4): Fix a regression in short AES mode reads 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f3ed4a38b5202a4414df8994b8a75d24245f0b9d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644890966; 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=YrN4r2SWM2nhRvSttpkSdYqmOPpv3lFrRRGj6DbQkOQ=; b=mmokm3Erfo5uX9bkSN2zg4kC43+eWL4+EmLemKDNIG7BEKUf+oCGNZ+rjv4xecR08WoNo6 zDPuiaqrBN7GaOOjcDSmYvJMj+LB4Le23dCLJ+xMOPLCySqpmtN74myie028YL9IaiR8K2 H+e1UPrnkwtvCuViaggS3K5j4LICBd5sEk3d7ZtQkmDcrmsLLQaCZtQz4dQy9Q0qprg6nz UL3ND1FdvVyvfu2cN29adGFHenB6Kao81zOLs13P2e8u7yw10DaPpfbPZJqTq+LT+qER5Q BO2u2s2Lf1LYPjb+yzpMHuhjIwAGAvN1Y0ODDGbAUO85z0xgAaMDQWALqtOduA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644890966; a=rsa-sha256; cv=none; b=ngLXmIrFXtZk365YvdlZ85tY5w6iULKpiruokbzAcf8BWdrQ6KfDMVbRFlJM+zHB06cBwq 6SAlQX8ehzM0m11xQvKfjDjpxo6k9lTMJlj9NQdb0WkyvJuAYXOhVkHtYDgwX1vQNFdYea O7jrXvVUmej8k0F/OclFxtSAB/DBlqNdLqzJ9PkzfjdXyksMHvgAswPaJkKIvUot/943tT DFhRNvqUhoSj4Lflpb+L1IKOQ8hYTd6gXUJ4RRrCXXd2ympFPbC+GARpk30QM57A5yySDX lelGf+S9E07c2mpB5YcDc83ETpOiw0Tk7wIncKwfn0PxBnBZDHAclEWBYmz0jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=f3ed4a38b5202a4414df8994b8a75d24245f0b9d commit f3ed4a38b5202a4414df8994b8a75d24245f0b9d Author: Conrad Meyer AuthorDate: 2019-06-18 18:50:58 +0000 Commit: David E. O'Brien CommitDate: 2022-02-15 02:09:08 +0000 random(4): Fix a regression in short AES mode reads In r349154, random device reads of size < 16 bytes (AES block size) were accidentally broken to loop forever. Correct the loop condition for small reads. (cherry picked from commit 22eedc9722746206bf2f8b0c5fcdab58917c7bd5) --- sys/dev/random/fortuna.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/random/fortuna.c b/sys/dev/random/fortuna.c index f7f8a753c790..0e66ba3e97f6 100644 --- a/sys/dev/random/fortuna.c +++ b/sys/dev/random/fortuna.c @@ -489,7 +489,7 @@ random_fortuna_genbytes(uint8_t *buf, size_t bytecount, if (!random_chachamode) chunk_size = rounddown(chunk_size, RANDOM_BLOCKSIZE); - while (bytecount >= chunk_size) { + while (bytecount >= chunk_size && chunk_size > 0) { randomdev_keystream(p_key, p_counter, buf, chunk_size); buf += chunk_size;