From nobody Tue Dec 16 23:43:00 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 4dWD511pqBz6LPg6 for ; Tue, 16 Dec 2025 23:43:01 +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 4dWD505lMLz3Fqp for ; Tue, 16 Dec 2025 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928580; 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=gMVhVxkNUxIbbexP8YrYMQvrgdEzgqO7TX1U+2G9fx4=; b=bkFfWL1qWtLihlFSIRQMpIbjqEALnNNbS2TROrKOJqazguByBywBpmq5XCIj82+/5tBLx+ CejeFc5wqBmvx09tvAJ5gDJrXdaSmX3LZLnI21yTab+JzYHR3tAVdfcDed+NdqNuM/D6gi vMgWEk8jXUknllFvMhZjp/GhRjSiTKQSEtZtRRoEV7U7cSXB3UmssI3/B6ryUmk4rW1Ep0 4CvmiU+s52PuGWt4MNCvwOmzFU6K1J5dZQcPIG2JCSfP8HnxFT0IRWBZhNLfI3XJSxXQ2m /0imAzGQ4g7i5MSQcKXUCNmjKZieA1YWv8eNpOK4ab1BA87GBK4F77HKAQo0DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928580; 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=gMVhVxkNUxIbbexP8YrYMQvrgdEzgqO7TX1U+2G9fx4=; b=kveHT/VgbgwBAQcX1tbQF4kJvECtEITchmpzfFjHD/EdDibyEMyTeKieAwI9FMj6a5p3YE qbPiTgAK4ZWYu0dv/ar3ZzHco+h0soQuAmJi6XEAdnxXG/9FMKjpQqcQvzz7O7aI3WVLze ch+z1gTm7QXf5HdMmAXK6kW+raGtKj1AHzP/JZgfVoR0r0ATo7vZpSiMyzqeXUgzZ9sqLK 8W8gURoSvoX5K2uLomQPGkVSnpsaoJNnBpBAWadC9lbZ8yTYD2AiWP7i7fWRQChQMCiT/n aeEc2wmN05r/4oramRm5Lyoc6DeGAPYGQIyQ2GlDELmY72SG9uHOvD0EYUXroA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765928580; a=rsa-sha256; cv=none; b=hoPatPFECuGygv7GdiMcvIihKCMr53mHbzU4eB4nQo7LkGQ6vUH6KS97v8buUhCgfiUnJj t03IllzirHL1n+mh60D0qWlz5PIFEN6YM7ruMo040ck1sj3Ixkj0jFt/8vEoyraPf8lt8g aSOpJSePiGluTN9+e8Ykr6Gcu2TisGSYSR8wPxAHNiuAhqsUZbLqoMUXQbpsyRo3urpiBK 5tqKdSwSOJuCXpYw5O3i61iYbDwilJeN3K9q7Lm2GWVcolPppTZ8K/ECFArPJzJ9vrVGKY OlNsYEoAHhO/coc2j0aIBI3A35gMsMZtXXCEgr6xj+e2WhYuOrCBVvrz9tO5Vg== 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 4dWD505HJFzCCb for ; Tue, 16 Dec 2025 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 237e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 23:43:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Bojan Novk=?utf-8?Q?ovi=C4=87?= From: Mark Johnston Subject: git: 04e9f1aab83a - releng/15.0 - amd64/vmm.c: Fix an incorrect memory segment check in vm_iommu_{un}map 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 04e9f1aab83a00e5b61aaed50fabf1cd69fb01cf Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 23:43:00 +0000 Message-Id: <6941ee84.237e6.382387b3@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04e9f1aab83a00e5b61aaed50fabf1cd69fb01cf commit 04e9f1aab83a00e5b61aaed50fabf1cd69fb01cf Author: Bojan Novković AuthorDate: 2025-12-13 14:53:45 +0000 Commit: Mark Johnston CommitDate: 2025-12-16 16:01:22 +0000 amd64/vmm.c: Fix an incorrect memory segment check in vm_iommu_{un}map This change fixes two checks that conflated memory mapping and memory segment idenitifers. In both cases the code iterates over all memory mappings but passes the index to `vm_memseg_sysmem`, which is wrong. Fix this by passing the memory mapping's segment identifier instead. Differential Revision: https://reviews.freebsd.org/D54210 Reviewed by: markj Fixes: c76c2a19ae37 PR: 290920 Approved by: so Security: FreeBSD-EN-25:20.vmm (cherry picked from commit f1809eab82a796845f126b703c01d4a31ccf2193) (cherry picked from commit 4f7436bf297b93fd9e835ffca3d56288ce934dc5) --- sys/amd64/vmm/vmm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index c42da02d0bf6..cffbdf047d32 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -755,10 +755,10 @@ vm_iommu_map(struct vm *vm) sx_assert(&vm->mem.mem_segs_lock, SX_LOCKED); for (i = 0; i < VM_MAX_MEMMAPS; i++) { - if (!vm_memseg_sysmem(vm, i)) + mm = &vm->mem.mem_maps[i]; + if (!vm_memseg_sysmem(vm, mm->segid)) continue; - mm = &vm->mem.mem_maps[i]; KASSERT((mm->flags & VM_MEMMAP_F_IOMMU) == 0, ("iommu map found invalid memmap %#lx/%#lx/%#x", mm->gpa, mm->len, mm->flags)); @@ -803,10 +803,10 @@ vm_iommu_unmap(struct vm *vm) sx_assert(&vm->mem.mem_segs_lock, SX_LOCKED); for (i = 0; i < VM_MAX_MEMMAPS; i++) { - if (!vm_memseg_sysmem(vm, i)) + mm = &vm->mem.mem_maps[i]; + if (!vm_memseg_sysmem(vm, mm->segid)) continue; - mm = &vm->mem.mem_maps[i]; if ((mm->flags & VM_MEMMAP_F_IOMMU) == 0) continue; mm->flags &= ~VM_MEMMAP_F_IOMMU;