d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

execve: disallow argc == 0

Browse Source 
The manpage has contained the following verbiage on the matter for just
under 31 years:

"At least one argument must be present in the array"

Previous to this version, it had been prefaced with the weakening phrase
"By convention."

Carry through and document it the rest of the way.  Allowing argc == 0
has been a source of security issues in the past, and it's hard to
imagine a valid use-case for allowing it.  Toss back EINVAL if we ended
up not copying in any args for *execve().

The manpage change can be considered "Obtained from: OpenBSD"

Reviewed by:	emaste, kib, markj (all previous version)
Differential Revision:	https://reviews.freebsd.org/D34045
This commit is contained in:
Kyle Evans 2022-01-25 16:47:23 -06:00
parent 5cf0049653
commit 773fa8cd13
2 changed files with 10 additions and 1 deletions
lib/libc/sys
execve.2
sys/kern
kern_exec.c

5
lib/libc/sys/execve.2

@ -28,7 +28,7 @@
.\" @(#)execve.2 8.5 (Berkeley) 6/1/94
.\" $FreeBSD$
.\"
.Dd March 30, 2020
.Dd January 26, 2022
.Dt EXECVE 2
.Os
.Sh NAME
@ -273,6 +273,9 @@ Search permission is denied for a component of the path prefix.
The new process file is not an ordinary file.
.It Bq Er EACCES
The new process file mode denies execute permission.
.It Bq Er EINVAL
.Fa argv
did not contain at least one element.
.It Bq Er ENOEXEC
The new process file has the appropriate access
permission, but has an invalid magic number in its header.

6
sys/kern/kern_exec.c

@ -356,6 +356,12 @@ kern_execve(struct thread *td, struct image_args *args, struct mac *mac_p,
exec_args_get_begin_envv(args) - args->begin_argv);
AUDIT_ARG_ENVV(exec_args_get_begin_envv(args), args->envc,
args->endp - exec_args_get_begin_envv(args));
/* Must have at least one argument. */
if (args->argc == 0) {
exec_free_args(args);
return (EINVAL);
}
return (do_execve(td, args, mac_p, oldvmspace));
}