From nobody Mon Nov 09 03:13:56 2026 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 4jNFHS3FVBz70SCY for ; Mon, 09 Nov 2026 03:13:56 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNFHS2Qgqz3FdH for ; Mon, 09 Nov 2026 03:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794194036; 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=hfJxbvedxaYXdnMvxZlU/cz2JXejC6b0oln62b2pXdg=; b=WN4zkpgQKLabyk8l5W6yqnPdaggKwPwK/lzKgitnGHhk+22tM6bxPvMYGjmDOso6Fzl492 1CO3nQs/ifhUARb6C6OUvh1e7MUtgYapoJnDdh91QrAhkCPOSeTowP5X5p+jsOQPqKB2AA Ci/OKEqzpf+Yithv36SqHqavSgg+NXOevy17KwhbpqNwGxTEHe730lQACQA0nVvg93/W3f UP3AlM5LhjfODjGQbUQbyKtxNHbZLfffEAWMz3LAHA2c1T/UB/wIDaYTuaA09b/YZZwyee ZPUiO0hxwBsnzu2QU/HQw0W0lr9U6Hwzumilb7H649N62He35ripZAdX1Wt4Aw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794194036; b=diTlOYmwYbOoFbdmmjz2dgNt/TGGSEU0y2cbu3RQG3L1LJCHnImFXz/1KxiwHz2Ru3xWSJ H/aYhTUmlKfjjICqLnwe5pdTGLsDlIK3KmDAybWi2cpwHzHAx7bKp41u6givhtr+4m12Mc SSRL/ePlMjZH8gq4xRcn3QvqPYq3nUGiKE1vAKlVXbYgpzEa0GV8H9z7XSE9Vja4nDfIJA yF4l6Kmw+Jfjw8sBXjqt4dkEqucwxu1poSnjmCn13hUK10jBkPLEX0oH4iuI88JsCepGuU UpNo0jUBJz9zDL/nIMsFCySyQUa95SNui20F6WqBT6vQPD4n6Nzq7BS2DMdtUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794194036; 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=hfJxbvedxaYXdnMvxZlU/cz2JXejC6b0oln62b2pXdg=; b=IBLDGBys103tU9M/Y4bJVmtTEByVyqKVt6JGQB16ZkRhmgMDBCKJ/W01bddRiG4mJC6rCg 1eo+ozrogrV4I9UmDztl2RWa/CMFPCJPqyEuGncMMg9U6T/ZO2RlkRYeY9iaavfoT1mxG7 kflIK3lg+qyS1TC5JHH/nzliMjosFQ9Y/NWp1g+CORqzVAdNrq/wujuLDkDBbpo5cr9HQY FC6/z2QqfobqiqVEcNNhfLYf4x36yC6G2M+zjEN6pqCBAc9UB59VoBrvepzk/LoS8Q2iOR dNH0v5CPjL5y/JTS4WY2FWVvq1Vxda15PpQnYR1Br9TI2fjw2NmwSFLFFYHUIQ== 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 4jNFHS25QFzKnM for ; Mon, 09 Nov 2026 03:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 11803 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 03:13:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 45819a7c26d3 - stable/15 - virtio_random: avoid using vtrnd_detach in the failure path List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 45819a7c26d376730404caafba9f13b1a70185b5 Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 03:13:56 +0000 Message-Id: <6af13a74.11803.363d9b1b@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=45819a7c26d376730404caafba9f13b1a70185b5 commit 45819a7c26d376730404caafba9f13b1a70185b5 Author: Kyle Evans AuthorDate: 2026-11-04 21:31:31 +0000 Commit: Kyle Evans CommitDate: 2026-11-09 03:12:06 +0000 virtio_random: avoid using vtrnd_detach in the failure path On the off chance that we discover more than one virtio-random device, the second one will deregister the global instance or trip an invariant when it fails to attach and calls vtrnd_detach(). We don't have that many resources to free, so just inline those. This is purely a hygiene thing, we haven't seen an instance of this in the wild (to my knowledge). Reviewed by: bnovkov, kfv Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit 26ba71f73e8914ecd9e5b1e7bb864fee41158d04) --- sys/dev/virtio/random/virtio_random.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c index 3f30c8b68f4c..a253db5535dc 100644 --- a/sys/dev/virtio/random/virtio_random.c +++ b/sys/dev/virtio/random/virtio_random.c @@ -184,8 +184,15 @@ vtrnd_attach(device_t dev) vtrnd_enqueue(sc); fail: - if (error) - vtrnd_detach(dev); + if (error != 0) { + /* Parent will free the virtqueue. */ + if (g_vtrnd_softc == sc) { + atomic_store_explicit(&g_vtrnd_softc, NULL, + memory_order_release); + } + sglist_free(sc->vtrnd_sg); + zfree(sc->vtrnd_value, M_DEVBUF); + } return (error); }