From nobody Tue Feb 3 19:16:15 2026 X-Original-To: dev-commits-src-main@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 4f5Crb5GCSz6Qbbq for ; Tue, 03 Feb 2026 19:16:15 +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 4f5Crb2pHTz3bmK for ; Tue, 03 Feb 2026 19:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770146175; 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=1tPDUQukETNHIXVS4wg1ks3ry4/LjCewJVvA5I71KdQ=; b=dBsq4xWnysPfXSG1Viy3kQWMI6DzYiB6tKI+c6tbRHd791dCFP9u/wdzHlP/6ZMZBlULHz 0b/cmWNfCK2Ay2ccqJVdMMoONj3AFQdR1kK4W6auxW8Gsz4caOBKaZyEsvw7J1bPeNvmhC yqwQ1YhZGr/vJ45cJBrcsSVDbyqLsk+WOmVF7w6XVUVPlkBayHeW78N7XByoqKuwg4bRQb 3pf6cvctHQX4nUXRIrFQFwRAQMaXfZcL2CLrM+TpH2XhsWM0+xKUrzsLwpzN3P4YiaVOQt B3ItB2LWL1mmtnrm8ebkfcAgGeJy3P/1/oqN4Pq7890ZSEsIvLpgI5nm3nFvVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770146175; a=rsa-sha256; cv=none; b=vsJ42tiAMI7w5eBStza70W7qlGDoVk0MDEMQMpy5renbsbshfwRHD6Y3bSEFwkO8rbkXb4 DDTFBrbJVmGHigUlAWOExN6zLV3ZNSeKRBxXintLgHMwm+fW9FhrForXO07JVfAs7BTk5m CeNV+n1nf4kaRN23daRXBDuWBX/PtbZ6f8k4q6HDFZSVs1dwIUNwHE9u99Ct1F8XmVg5dU uaUYj+oXjFR/oyOmaMRgDeN9Fv3+tBQlK7WCi00Uho6/4GAxoYcyglu7oyLkLwXfWXBcJL dESmrlinY0R+GnQGjsalTROTZbiYEsEGmUoM4nzGQcHb6uajkwcpOHQB9uzoiA== 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=1770146175; 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=1tPDUQukETNHIXVS4wg1ks3ry4/LjCewJVvA5I71KdQ=; b=XOipgfCCgscWUPppIRifJdHk1Ik0CZ8sAyrXOaevPXo4V/x/5f72iiHBPrWuzaFgwNGv20 5DXVD/aplSDs5JYDqb5Sf7GztLjpTBS6adYEH2Uv4fNmohZfScbzcXm2lBo1T7ruKSZ8Or M3bYD0Hj2zmJW7NsvUdL+E2WEuT8RDw2OeVNSEA/1eEKlTskCXR2XRTVbkMK8NEEKDJaZQ 6qgiSN8rfFbqxqxWflzEQhrNpvwJr5I7x5IuBefdYQzt4P3gKHd38wuJNKkZk49WSMcd3C xqZedUKc11lpjyYvUa8iqUBpAJVAB/zNFc3QUVpr0mhWcG+cNGfTm/I3QsRwPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5Crb1SfWz95G for ; Tue, 03 Feb 2026 19:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33420 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 19:16:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8cfa6ddcee02 - main - vmm: Fix a resource leak in an error path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8cfa6ddcee021adaf9515286e25dd0c961adf8a4 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 19:16:15 +0000 Message-Id: <6982497f.33420.536840f1@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8cfa6ddcee021adaf9515286e25dd0c961adf8a4 commit 8cfa6ddcee021adaf9515286e25dd0c961adf8a4 Author: Mark Johnston AuthorDate: 2026-02-03 19:09:28 +0000 Commit: Mark Johnston CommitDate: 2026-02-03 19:09:28 +0000 vmm: Fix a resource leak in an error path vmmdev_create() increments the VM count as its last step and calls vmmdev_destroy() if it fails. However, vmmdev_destroy() unconditionally decrements the count. Correct this bug by reordering operations. Fixes: 1092ec8b3375 ("kern: Introduce RLIMIT_VMM") Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D55068 --- sys/dev/vmm/vmm_dev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index fa51dc950459..ad3cc5725f9c 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -990,9 +990,15 @@ vmmdev_create(const char *name, uint32_t flags, struct ucred *cred) return (EEXIST); } + if (!chgvmmcnt(cred->cr_ruidinfo, 1, vm_maxvmms)) { + sx_xunlock(&vmmdev_mtx); + return (ENOMEM); + } + error = vm_create(name, &vm); if (error != 0) { sx_xunlock(&vmmdev_mtx); + (void)chgvmmcnt(cred->cr_ruidinfo, -1, 0); return (error); } sc = vmmdev_alloc(vm, cred); @@ -1015,12 +1021,6 @@ vmmdev_create(const char *name, uint32_t flags, struct ucred *cred) vmmdev_destroy(sc); return (error); } - if (!chgvmmcnt(cred->cr_ruidinfo, 1, vm_maxvmms)) { - sx_xunlock(&vmmdev_mtx); - destroy_dev(cdev); - vmmdev_destroy(sc); - return (ENOMEM); - } sc->cdev = cdev; sx_xunlock(&vmmdev_mtx); return (0);