vmm: Simplify the VM_ALLOC_MEMSEG ioctl a bit

markjdb · markjdb · commit c3f41c02c9a5 · 2025-11-04T13:52:01.000Z
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
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -619,20 +619,16 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag,`
`619`	`619`	`}`
`620`	`620`	`error = domainset_populate(&domain, mask, mseg->ds_policy,`
`621`	`621`	`mseg->ds_mask_size);`
`622`		`- if (error) {`
`623`		`- free(mask, M_VMMDEV);`
	`622`	`+ free(mask, M_VMMDEV);`
	`623`	`+ if (error)`
`624`	`624`	`break;`
`625`		`- }`
`626`	`625`	`domainset = domainset_create(&domain);`
`627`	`626`	`if (domainset == NULL) {`
`628`	`627`	`error = EINVAL;`
`629`		`- free(mask, M_VMMDEV);`
`630`	`628`	`break;`
`631`	`629`	`}`
`632`		`- free(mask, M_VMMDEV);`
`633`	`630`	`}`
`634`	`631`	`error = alloc_memseg(sc, mseg, sizeof(mseg->name), domainset);`
`635`		`-`
`636`	`632`	`break;`
`637`	`633`	`}`
`638`	`634`	`case VM_GET_MEMSEG:`