Module Name: src
Committed By: bouyer
Date: Mon Apr 21 10:00:35 UTC 2014
Modified Files:
src/sys/kern [netbsd-6-0]: kern_exec.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1048):
sys/kern/kern_exec.c: revision 1.403
'error' is not set on failure. This is a true bug: everything is freed
and unlocked while zero is returned. Since there's no error, execve_runproc()
will get called and will try to use those freed things.
To generate a diff of this commit:
cvs rdiff -u -r1.339.2.5.4.2 -r1.339.2.5.4.3 src/sys/kern/kern_exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.339.2.5.4.2 src/sys/kern/kern_exec.c:1.339.2.5.4.3
--- src/sys/kern/kern_exec.c:1.339.2.5.4.2 Mon Feb 3 11:56:20 2014
+++ src/sys/kern/kern_exec.c Mon Apr 21 10:00:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.339.2.5.4.2 2014/02/03 11:56:20 sborrill Exp $ */
+/* $NetBSD: kern_exec.c,v 1.339.2.5.4.3 2014/04/21 10:00:35 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.339.2.5.4.2 2014/02/03 11:56:20 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.339.2.5.4.3 2014/04/21 10:00:35 bouyer Exp $");
#include "opt_exec.h"
#include "opt_ktrace.h"
@@ -820,6 +820,7 @@ execve_loadvm(struct lwp *l, const char
if (len > data->ed_pack.ep_ssize) {
/* in effect, compare to initial limit */
DPRINTF(("%s: stack limit exceeded %zu\n", __func__, len));
+ error = ENOMEM;
goto bad;
}
/* adjust "active stack depth" for process VSZ */
