From nobody Tue Nov 04 14:36:01 2025 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 4d19xG0hDTz6G9RM; Tue, 04 Nov 2025 14:36:02 +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 4d19xG00s1z3CW3; Tue, 04 Nov 2025 14:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762266962; 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=I2Ss6wozqQHyIXp9+M5fZpoy1mMcO8mQ9n6tgmKlBGc=; b=yQrvHXYZieF2e3VLS6EUg0mnhzXvRX2TdkeTi0rtY768dLVrXkn/yfDnmbBuo0YJoIhUWh n9lHnKEYbiUw4qY8WpnfRVti9tLjIxQIyTlMAtLp1itQrgZWqT0uiK6sbfkL+4eCMNMS0/ 7ZdnD2sNmfQj4hQOxGpu4IC4HF5VInV+/6oFM6FBBf7xkNYasb+YGBWoJJxP4BLX+YwD6I /9rxE5D/Wu67AOK1cgLWK9Pk/Q4MjCultKtZUHIRd6Ncjz7L0ItET8RdxA9fBrbCt/pkC2 PUW3pT+gZB0yEHpqynXekTgG+VAWmeo6JOQvzFyHkgFuqce/mufXqYLSRXIdWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762266962; 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=I2Ss6wozqQHyIXp9+M5fZpoy1mMcO8mQ9n6tgmKlBGc=; b=mdDjHeVu8um0o55p3dTqsAGHpsestdF3WP/VwGEG+ocp57QXdK5pwYj55/MBZM6aDKotNa 3U/7AgGdPsW2ahb3H18Fqx6Vrv5P3HYlKCP3o15p6VnWoQsiiXmMG7Ug0fgS9l7cHtTOqU sYywQa3WE1ZvcsAKybfX9KzRoXpqxSTK0WkAusGfTEK9TNnIlNBkx7WNTQ5qTUTfoxaxyW MMtH9p/DeiPF+TAOkmRdpk/IqgWScmMgnNg7w3+2wTpHWDwmw4I/J5MgbcDxxDilrHMuph gL4m3ibcSAftKGjqcqm+QDFjGwebGA/0lhP5pZVLjyeXE5PeMFcVO9aqIDJAhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762266962; a=rsa-sha256; cv=none; b=N5rdqUOXsxAb+oH+Dvh/OKy2f0A8QqcSX9DCa/eV7pAHSw0oRlHwVsIiQHJg5XLhsts+OY ABcUOxCFz3HQ9JW6HN0JTiER89c3GRLT62y6ish0unGjhvLa3R/Sgf1JxFANlLiKWYE8VQ /h6kuRmsJA5slZOS3NtOFCVKjEwVMQ2xugge0PlTN7V9A/CUI3Ol4ykCsPSLBXwGccBHo4 vPdPNHXr7br3M7djhWiC64a1VT+53wWFWZ/0wbG3s8mhD35udgvJlH+R2uV7Av2DBDm3cl wqJxhjMwND2eURhASMlHbNDHJtJN20BwgyeUPif84SjMk/0OvR3BnlVevBz6PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d19xF6fFnz112Z; Tue, 04 Nov 2025 14:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4Ea1lb004680; Tue, 4 Nov 2025 14:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4Ea1ig004677; Tue, 4 Nov 2025 14:36:01 GMT (envelope-from git) Date: Tue, 4 Nov 2025 14:36:01 GMT Message-Id: <202511041436.5A4Ea1ig004677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c3f41c02c9a5 - main - vmm: Simplify the VM_ALLOC_MEMSEG ioctl a bit 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: c3f41c02c9a5bf45504af59c351f0ae336719753 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c3f41c02c9a5bf45504af59c351f0ae336719753 commit c3f41c02c9a5bf45504af59c351f0ae336719753 Author: Mark Johnston AuthorDate: 2025-11-04 13:52:01 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 13:52:01 +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 --- 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: