From nobody Tue Oct 21 17:49:18 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 4crftl0Yr0z6CgCg; Tue, 21 Oct 2025 17:49:19 +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 4crftk6zDTz3d7B; Tue, 21 Oct 2025 17:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068959; 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=SNC5od+BBSOw/hX/etMoe2of9MiesX8b0PxHXGyQVug=; b=G3npate9oPHP67NQ5/CoexTpUI7j72B1m87B/xkZpoTTYoODU7TdOtfaFqACZ6Tl9cpUoy euk9fL8VMVPYW0XayWWio2Sz58LFNY8qI6aMCDHzz6bwhslELjdIleHwyxCaOi9qgL09iD YZuXIIgUnvuao2eYGrMLWZP+CJxQq5uHU53K87by0/E10wJPSiwuVxH42wwYoYU43UH2ng hTD7F9nPjm23JSdlsybSNK4EDWMH70jhzCTLM1t6HjsxGhkIxb2Y4M9f04HrQjquZsYAo3 5KY6uzW47SYBNMKjHF5e2uZ6I3lkUcCqtwNZjjj/PY9//3C4gPZ7eFjA8KqRSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068959; 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=SNC5od+BBSOw/hX/etMoe2of9MiesX8b0PxHXGyQVug=; b=qQbyMj2J/RHoyb6P0IcGIbSZ1qY3mlJ/ItID++wHk8yAys1CcjlqLgqdhgxFh+e1wJUeDn tfT1AD1+7iAEVTUFN1LQpaxHMb8y7IQ2pawgKQCCNpKH2YVMONPiv5xpBXaEgsHl+5tbGh gwNQZkEyXHXw0O2a1A9MBmE58z+1arQCkMkfseU9AphdNmsIhVG8XSy1ohwylUl27PqLA8 8UyFf7qJynZ7aVvLhfgPjLF0HWTrwcKZsHKBY1VXNdRdCWMa5B7+C2wUJ7inev/oAKs1eR u20fH3vVUCiA8++V/rneBmDMDZAzHCPHYuKu9dNYqpZcaRA4O3/dHEcRjjBbfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761068959; a=rsa-sha256; cv=none; b=ArZXbF4Kq6S5AJrNbiTNLnubdO2gMjdUU9UADP+DkCOM03xDzoXrqGwwsFUdUA344G+iNT mLi+y0L2w/v0oXj9jW2V0TVZdQ6hhB2ujgtNxhH1qvr0+5y8YGPMzNn9ZM37z74oIa0Oj1 tpV+kx5qanR1o+JZvGxW50kphjM/olFlJ/Lw/Z8fIJN5jyZDKlNMYlKDTIUbjj+dla56hl ve7i14Kil1ryGfCWLI7v49QeSVxkzbG6WyEfTlVnx8HAeuvrw3hAA/G0GhflSRvnynyrjU unG/StEmNp5cTeonJOVW1pQpNyDaGB4UukaUmoYoD29DDKZqS9Ou/wwfm96YSw== 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 4crftk6Z3Zz186S; Tue, 21 Oct 2025 17:49:18 +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 59LHnIDS029304; Tue, 21 Oct 2025 17:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHnIWY029301; Tue, 21 Oct 2025 17:49:18 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:49:18 GMT Message-Id: <202510211749.59LHnIWY029301@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: 14133abfe9c2 - main - vmm: Improve register get/set handling 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: 14133abfe9c218b97e888edf04d2ec4a86e7ab4b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14133abfe9c218b97e888edf04d2ec4a86e7ab4b commit 14133abfe9c218b97e888edf04d2ec4a86e7ab4b Author: Mark Johnston AuthorDate: 2025-10-21 17:34:11 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 17:34:11 +0000 vmm: Improve register get/set handling a bit On non-amd64 platforms, check for negative register indices. This isn't required today since we match against individual register indices, but we might as well check it. On amd64, add a comment explaining why we permit negative register indices. Use mallocarray() for allocating register arrays in the ioctl layer. No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53143 --- sys/amd64/vmm/vmm.c | 3 ++- sys/arm64/vmm/vmm.c | 5 ++--- sys/dev/vmm/vmm_dev.c | 16 ++++++++-------- sys/riscv/vmm/vmm.c | 5 ++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index f7c59847140b..473887240b9b 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -870,7 +870,7 @@ vm_assign_pptdev(struct vm *vm, int bus, int slot, int func) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - + /* Negative values represent VM control structure fields. */ if (reg >= VM_REG_LAST) return (EINVAL); @@ -882,6 +882,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; + /* Negative values represent VM control structure fields. */ if (reg >= VM_REG_LAST) return (EINVAL); diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index bf52dc0fe916..14ea26c3668c 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -1279,8 +1279,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); return (vmmops_getreg(vcpu->cookie, reg, retval)); @@ -1291,7 +1290,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); error = vmmops_setreg(vcpu->cookie, reg, val); if (error || reg != VM_REG_GUEST_PC) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 4961b21180e1..27bd115a4fd3 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -656,10 +656,10 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } - regvals = malloc(sizeof(regvals[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); - regnums = malloc(sizeof(regnums[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); + regvals = mallocarray(vmregset->count, sizeof(regvals[0]), + M_VMMDEV, M_WAITOK); + regnums = mallocarray(vmregset->count, sizeof(regnums[0]), + M_VMMDEV, M_WAITOK); error = copyin(vmregset->regnums, regnums, sizeof(regnums[0]) * vmregset->count); if (error == 0) @@ -682,10 +682,10 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } - regvals = malloc(sizeof(regvals[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); - regnums = malloc(sizeof(regnums[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); + regvals = mallocarray(vmregset->count, sizeof(regvals[0]), + M_VMMDEV, M_WAITOK); + regnums = mallocarray(vmregset->count, sizeof(regnums[0]), + M_VMMDEV, M_WAITOK); error = copyin(vmregset->regnums, regnums, sizeof(regnums[0]) * vmregset->count); if (error == 0) diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index 4c9b1fa53f7a..24b4be89af48 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -954,8 +954,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); return (vmmops_getreg(vcpu->cookie, reg, retval)); @@ -966,7 +965,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); error = vmmops_setreg(vcpu->cookie, reg, val); if (error || reg != VM_REG_GUEST_SEPC)