Module Name: src
Committed By: riz
Date: Mon Apr 16 15:28:19 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: kern_exec.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #181):
sys/kern/kern_exec.c: revision 1.350
Fix leak in a posix_spawn error path, from Greg Oster.
To generate a diff of this commit:
cvs rdiff -u -r1.339.2.4 -r1.339.2.5 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.4 src/sys/kern/kern_exec.c:1.339.2.5
--- src/sys/kern/kern_exec.c:1.339.2.4 Thu Apr 12 17:05:36 2012
+++ src/sys/kern/kern_exec.c Mon Apr 16 15:28:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.339.2.4 2012/04/12 17:05:36 riz Exp $ */
+/* $NetBSD: kern_exec.c,v 1.339.2.5 2012/04/16 15:28:19 riz 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.4 2012/04/12 17:05:36 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.339.2.5 2012/04/16 15:28:19 riz Exp $");
#include "opt_exec.h"
#include "opt_ktrace.h"
@@ -2012,8 +2012,16 @@ spawn_return(void *arg)
return;
report_error:
- if (have_reflock)
+ if (have_reflock) {
+ /*
+ * We have not passed through execve_runproc(),
+ * which would have released the p_reflock and also
+ * taken ownership of the sed_exec part of spawn_data,
+ * so release/free both here.
+ */
rw_exit(&l->l_proc->p_reflock);
+ execve_free_data(&spawn_data->sed_exec);
+ }
if (parent_is_waiting) {
/* pass error to parent */
