From nobody Thu Oct 22 17:31:56 2026 X-Original-To: dev-commits-src-branches@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 4j9Y9m6v5pz6xPTX for ; Thu, 22 Oct 2026 17:31: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 4j9Y9m4wLJz3H3L for ; Thu, 22 Oct 2026 17:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=poGV2tV6Qnu3KrqYoPBB4ZqdEyC2b0jtaZtJHbPd78U=; b=Sb0Uawee4H78MUTgS8vgLZmtv5Vb9X+KTvQ4t7PuJUQ+hzcGzyf6GMcz+9fm7sS49uQu8C DkvRG8MakfY3ACc5C8F1KIml9WgXByS9prU2oKFF14JBcNbCSR1A8SsDT0Lybs7sZRqNqc xmsSfjygqr+Kj8RlLINgPDsAdYuFNkhK+tw4k+Fj86KiOpNATIfNu5IhvFX6yMo+9kljuH OanYaZs2nD9aSdnlPx+bBYmgC2fpVA/JgMx8MeMA61IUwrWhP3pJ4pWFQQ89pmY8L4uT0o 7rw684CGttd2UTG+TYU6voVjTh1Y88XwngNDRruUBr3h08//jQNqBSUs08IAhg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690316; b=QLbtyZnx0nLinxort5x9js4muRu0Lbxi1HKwaO0CmxGxT58vO465ybpV0JFmFLo8S0me9z TvAnKKuaPCyJtEAKt1PsNW6oqU8YKvEE+F4Dkpz56ICUenCOUYVX9fIBcsQPSNRUJXOOIO naDRomjzh3XtR+M2hq+XWa9Iuy9JFAC+XM+N6VNZUz9+gdniZwxEhdHcDmZ5cEMHexP7nv B8/0/bk2fZlRVbQ88vDGPKV0uJxDFgO4hMQZ96mHTe/xxq51qFyD9NOvwk8bchpsz1ko5H w+2E8/LyWPKvCLQtfRgRV2RLG8Z1eG29MALOWsVeYl2hez2hXxKvHRbpSdgxAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=poGV2tV6Qnu3KrqYoPBB4ZqdEyC2b0jtaZtJHbPd78U=; b=EphwcfHwKDY3cqUX8fSzeTTIDFokP+iw1mAKw8ay0D/aRgroQI8t/Qyb1arLvQ8LNkxnm5 0dji5R9kGFErRlaCKX2PpbV0D6YCy4BSlodTHumaGmGnoqcQIX9PNb4j80l9Ga6TEGnvRj mrswAW5YXsOo5wfQy6em8gV16D4/D/0S77nzeq6IzASp4NrmguD1K1dGSWn+/rL21a7hIN /3h9UpVbUNiGO5CubN7NmGClec18/noWJdf5HYT8hwR95VsxaUvshCA1BrnlKb7TlZmjJK zDTtdEid045C0iyESOS90Dv4Yzgtaez1lG9M9kZidRmC/kBIdPwOZ7J+6vSkig== 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 4j9Y9m3swpzsRw for ; Thu, 22 Oct 2026 17:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d055 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:31:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: d06b50fa9e65 - stable/15 - vmm: Fix a page wiring leak in MOVS emulation List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d06b50fa9e6557b98bf07a09d69967a4c3b47682 Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:31:56 +0000 Message-Id: <6ada488c.3d055.58188ea4@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d06b50fa9e6557b98bf07a09d69967a4c3b47682 commit d06b50fa9e6557b98bf07a09d69967a4c3b47682 Author: Hayzam Sherif AuthorDate: 2026-09-21 16:34:08 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:40 +0000 vmm: Fix a page wiring leak in MOVS emulation When emulating a MOVS from MMIO to guest RAM, the kernel's vm_copy_setup() wires the destination pages. If the subsequent MMIO read fails, emulate_movs() skips vm_copy_teardown(), leaking the page wire references acquired during setup. Run vm_copy_teardown() regardless of the MMIO read result, and only copy the value to guest memory if the read succeeds. Preserve the existing error return. This matches illumos change 13309. Reviewed by: markj Obtained from: illumos 83cd75bb2949d26e6eb38ddefc60fdeed1909643 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59823 (cherry picked from commit ce5b70657f94d2051566664d3ea7167d104803b0) --- sys/amd64/vmm/vmm_instruction_emul.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c index c54b6e6d0074..963da132c36b 100644 --- a/sys/amd64/vmm/vmm_instruction_emul.c +++ b/sys/amd64/vmm/vmm_instruction_emul.c @@ -858,11 +858,17 @@ emulate_movs(struct vcpu *vcpu, uint64_t gpa, struct vie *vie, * before the MMIO read is attempted. */ error = memread(vcpu, gpa, &val, opsize, arg); - if (error) - goto done; + if (error == 0) + vm_copyout(&val, copyinfo, opsize); - vm_copyout(&val, copyinfo, opsize); + /* + * Release the copy resources even if the MMIO read + * failed. + */ vm_copy_teardown(copyinfo, nitems(copyinfo)); + + if (error != 0) + goto done; } else { /* * Case (4): read from and write to mmio.