git: 74ef8d180fb0 - stable/12 - vmm: Bump vmname buffer in struct vm to VM_MAX_NAMELEN + 1

[Ka Ho Ng]

The branch stable/12 has been updated by khng:

URL: https://cgit.FreeBSD.org/src/commit/?id=74ef8d180fb0f063fffc63b7100073c1a43f8bf6

commit 74ef8d180fb0f063fffc63b7100073c1a43f8bf6
Author:     Ka Ho Ng <khng at FreeBSD.org>
AuthorDate: 2021-08-02 09:54:40 +0000
Commit:     Ka Ho Ng <khng at FreeBSD.org>
CommitDate: 2021-08-27 12:05:34 +0000

    vmm: Bump vmname buffer in struct vm to VM_MAX_NAMELEN + 1
    
    In hw.vmm.create sysctl handler the maximum length of vm name is
    VM_MAX_NAMELEN. However in vm_create() the maximum length allowed is
    only VM_MAX_NAMELEN - 1 chars. Bump the length of the internal buffer to
    allow the length of VM_MAX_NAMELEN for vm name.
    
    Reviewed by:    grehan
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D31372
    
    (cherry picked from commit df95cc76affbbf114c9ff2e4ee011b6f162aa8bd)
---
 sys/amd64/vmm/vmm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index 9774cc60d187..f22b213e9c96 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -164,7 +164,7 @@ struct vm {
 	struct mem_map	mem_maps[VM_MAX_MEMMAPS]; /* (i) guest address space */
 	struct mem_seg	mem_segs[VM_MAX_MEMSEGS]; /* (o) guest memory regions */
 	struct vmspace	*vmspace;		/* (o) guest's address space */
-	char		name[VM_MAX_NAMELEN];	/* (o) virtual machine name */
+	char		name[VM_MAX_NAMELEN+1];	/* (o) virtual machine name */
 	struct vcpu	vcpu[VM_MAXCPU];	/* (i) guest vcpus */
 	/* The following describe the vm cpu topology */
 	uint16_t	sockets;		/* (o) num of sockets */
@@ -451,7 +451,8 @@ vm_create(const char *name, struct vm **retvm)
 	if (!vmm_initialized)
 		return (ENXIO);
 
-	if (name == NULL || strlen(name) >= VM_MAX_NAMELEN)
+	if (name == NULL || strnlen(name, VM_MAX_NAMELEN + 1) ==
+	    VM_MAX_NAMELEN + 1)
 		return (EINVAL);
 
 	vmspace = VMSPACE_ALLOC(0, VM_MAXUSER_ADDRESS);