From nobody Wed Nov 04 21:34:32 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 4jKdxh2q25z705vb for ; Wed, 04 Nov 2026 21:34:32 +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 4jKdxh2Bvkz4h37 for ; Wed, 04 Nov 2026 21:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793828072; 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=/v2cClghtlaNwBLgAu9HcMd3PGr6woKwlXfNaQUIrrk=; b=kQSqLHQ6VQqUxEoaYGB8MqWGPkDEx3Je+CaJNKDhtV2gvz4y/4d0+wXvwddNjktfU1E1Ii udVs0g48wH6UFUf9k2lHxNX/hvGh5VpTrb6YrpgI0COuExXkVys9YtecvJSV8Hy4jYYFn+ 8CiufGpR+0u9TvEqDJ7OKOMKrIwM+M4jjNtDWp2S9re0WK+A7Vyc0CRygmvvcUJ80XG5pL yAbbyHcfUBvo7dUHk7jQ1Nyp4HFvhruGz+a6/0tLqgZEEuT/NJWV2BzXNmqKhUy+lziq+r DPorzAro7KRhCEjotbMoumlEB7NqZFbUyQiIhPDrVKMoN3s9n2f0S+WTxcKN8w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793828072; b=RaHviPiFnzlScE7GfV9nw8EVta6okfF6Wtux2VximqSrH4aG9PEmFCL2oIOe+w9etquZ7t drttPAn1ShZHRexaHxSOvxHOkna86lTSq0cqD2skXUTXmdRCPPqigt9vWnuvwNXrxXIPJ0 AVR8SkS/zgJKqUP/oeEbPeukmxliVtiL/NHm8aGQ4+B75cijtHGEEwMcMPYt5b+9IIwoWh 68yJAD/zHLgTgvL3tAhQDjflNjyuveSMBO2PynuN4Gd3Mvn3mL0YWeH78STfvSos0RuLbL 8nddlC12hZkHS9z9zErD8AeZXb/KFrQX3EKUfRPx2LjkVD+EHB/gSL+uA2VZwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793828072; 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=/v2cClghtlaNwBLgAu9HcMd3PGr6woKwlXfNaQUIrrk=; b=PiqemgnNXOTdVz3hUUZwBpfMv3jcYsjvFmvkrVXInhTqTVfUW8Av3IPf8hBOMyzS6hochN lfz8EEnnjVEk/w2/2iqgkkdDYB/5lcIjIk7F3zHBCX4drscuyHJAQNQUOg/R6O15nKVISW KDZEhBUa3Z3fvm2HElKYUP1J6dfYGZ9Kt+4B3m69rqpG3Es4VASyoySdNddXR5pB6givI1 2uqLOxk82bhzvFYmVx8E+FFSmZKuUPVBjjpnp7yBxcY6Eix/AE0ahdGqCVCrIYDUmrA1ni 9Vke7tEgwZZGODPJUbwCwqSIgsck7gQA5iuHqPhrGmEcgbkio8xVV8gTf1Z51Q== 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 4jKdxh1l5DzL3t for ; Wed, 04 Nov 2026 21:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20f3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 21:34:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 26ba71f73e89 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 26ba71f73e8914ecd9e5b1e7bb864fee41158d04 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 21:34:32 +0000 Message-Id: <6aeba4e8.20f3f.7ecb786f@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=26ba71f73e8914ecd9e5b1e7bb864fee41158d04 commit 26ba71f73e8914ecd9e5b1e7bb864fee41158d04 Author: Kyle Evans AuthorDate: 2026-11-04 21:31:31 +0000 Commit: Kyle Evans CommitDate: 2026-11-04 21:33:33 +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. Differential Revision: https://reviews.freebsd.org/D61050 --- 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); }