D56171.id174590.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D56171.id174590.diff
View Options

	diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c
	--- a/sys/dev/vmm/vmm_dev.c
	+++ b/sys/dev/vmm/vmm_dev.c
	@@ -271,7 +271,7 @@
	}
	KASSERT(dsc != NULL, ("%s: devmem segment %d not found",
	__func__, mseg->segid));
	- error = copystr(dsc->name, mseg->name, len, NULL);
	+ error = strlcpy(dsc->name, mseg->name, len) >= len;
	} else {
	bzero(mseg->name, len);
	}
	@@ -298,7 +298,7 @@
	if (VM_MEMSEG_NAME(mseg)) {
	sysmem = false;
	name = malloc(len, M_VMMDEV, M_WAITOK);
	- error = copystr(mseg->name, name, len, NULL);
	+ error = strlcpy(mseg->name, name, len) >= len;
	if (error)
	goto done;
	}
	diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
	--- a/sys/kern/imgact_shell.c
	+++ b/sys/kern/imgact_shell.c
	@@ -99,7 +99,8 @@
	exec_shell_imgact(struct image_params *imgp)
	{
	const char *image_header = imgp->image_header;
	- const char ihp, interpb, interpe, maxp, optb, opte, *fname;
	+ const char ihp, interpb, interpe, maxp, optb, opte;
	+ char *fname;
	int error, offset;
	size_t length;
	struct vattr vattr;
	@@ -231,8 +232,8 @@
	* use and copy the interpreter's name to imgp->interpreter_name
	* for exec to use.
	*/
	- error = copystr(fname, imgp->args->begin_argv + offset,
	- imgp->args->stringspace, NULL);
	+ error = strlcpy(fname, imgp->args->begin_argv + offset,
	+ imgp->args->stringspace) >= imgp->args->stringspace;

	if (error == 0)
	imgp->interpreter_name = imgp->args->begin_argv;