From nobody Tue Nov 18 15:02:49 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 4d9nsk3WPtz6HHCN for ; Tue, 18 Nov 2025 15:02:50 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsj5SPTz44Ky for ; Tue, 18 Nov 2025 15:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478169; 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=hrNYWSw9SKkWnDVl1Ho0LQgtk1L4AurnXD8KnQwDDNE=; b=XjzyXjxJQh6CSwH6vRrQN4plhPFCDpbBzYbImquQ6/x7PhuN3KOVxzANODl3bkk/jr81eP eH/mCkSLn4j6S3LpquMQNVhMm36zRb7PluIaREAdaqXKzjpZVpFDtaHZ7Ne7kUYcGkB4KC /lrydEFdepu45S2Nd50b71COiP99N7mvdqhEpM5SjzZbnNqs5KP4XrCgwLuiNQLQ3+vA+x 7TKur+a/vQ3FaQ9QMEgKV64pMXUUoYxfsYa7nDIW4QxH0aSPk7/h/YVEjTaEEkGYgkPjKK K5jFvdUDvs1KnH0rrGz4ZLLxM2Gw/0nK/MJB+b9xYyl+Q7sZR/teU6stJrsAkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478169; 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=hrNYWSw9SKkWnDVl1Ho0LQgtk1L4AurnXD8KnQwDDNE=; b=gKBBUzntorPOSb0na8T6nnHVC66YvZVbYS+31vK/pbGbXoQ3F8EbGctyZCWURIl6lUcZ3K F/+V8KxNxUV1ByH//IkvCUm9A8OSLSdNzSr5xW2DBiBIbTm9JWK/9K+4XPLTdb92n5TWZL v9PUEZVYvS2728lYJ+aXDlCcLwx3vqTeAYPU/4PXEGV3zeF5MhW+ZipIHqvuWDKrtkaGaz t0pZ2UMNLJVcHgo2D0VKfXTiSKcErban5ZTaf+tXI0rFN99IEpi45NBjdPfLg6SPhNDVmi 9tiEHUtnT1iMHqZ+jUwdxZ/lBkn1KeQvbS2lfy5Ldwu+gf1hrsNjQl3s1U/hlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478169; a=rsa-sha256; cv=none; b=CWWjP+Fg78MIubUnhYHvwIYkkdRX1d4ztpHb8+i+12mtxoK5LR8t6qKmKPzL88IVaxeoex s+Q9DCFJXxNlK0DJIw1IId4hCQFGuWesftipoV4ucBAkRj4Fb9ly+yFsRmosw98Ra6i27/ 041a/GaWPjAAt2UqNARv93q5ZlY/fPoythjutsuHVCoACa0X3hOK9STWrhCYg2qpCYn7Sf qbdDLhHLUpCmOOWDovVEzrayLEVBN0YGApnc4m94KbUEyPTE1D3fojSRPXn1xc0OUy1ia4 3C8GI09q2xyAL0kZYzuLB/GU1Y8/T2k+R1NLfo0MtGiAVSK+ERur5c7M87iC/Q== 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 4d9nsj4lkWz1073 for ; Tue, 18 Nov 2025 15:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 368cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 557047e9fa51 - stable/15 - vmm: Simplify the VM_ALLOC_MEMSEG ioctl a bit 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: 557047e9fa51fb697551ef3a717c3971aafeb21b Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:49 +0000 Message-Id: <691c8a99.368cb.3896748a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=557047e9fa51fb697551ef3a717c3971aafeb21b commit 557047e9fa51fb697551ef3a717c3971aafeb21b Author: Mark Johnston AuthorDate: 2025-11-04 13:52:01 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:27 +0000 vmm: Simplify the VM_ALLOC_MEMSEG ioctl a bit We can free the mask earlier, simplifying some error paths. No functional change intended. Reviewed by: corvink, jhb, emaste Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53418 (cherry picked from commit c3f41c02c9a5bf45504af59c351f0ae336719753) --- sys/dev/vmm/vmm_dev.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index ebbceb25b69e..bd20acac1d2d 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -619,20 +619,16 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, } error = domainset_populate(&domain, mask, mseg->ds_policy, mseg->ds_mask_size); - if (error) { - free(mask, M_VMMDEV); + free(mask, M_VMMDEV); + if (error) break; - } domainset = domainset_create(&domain); if (domainset == NULL) { error = EINVAL; - free(mask, M_VMMDEV); break; } - free(mask, M_VMMDEV); } error = alloc_memseg(sc, mseg, sizeof(mseg->name), domainset); - break; } case VM_GET_MEMSEG: