Module Name: src
Committed By: snj
Date: Tue Apr 14 05:12:17 UTC 2015
Modified Files:
src/sys/kern [netbsd-7]: kern_exec.c
src/sys/sys [netbsd-7]: exec.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #686):
sys/kern/kern_exec.c: revision 1.411
sys/sys/exec.h: revision 1.147
PR/49287: Masao Uebayashi: Handle exec_script argument vector from the 32 ->
64 bit case. When execing a 64 bit shell from a 32 bit binary the argument
vector was still incorrect.
To generate a diff of this commit:
cvs rdiff -u -r1.408.2.2 -r1.408.2.3 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.145 -r1.145.4.1 src/sys/sys/exec.h
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.408.2.2 src/sys/kern/kern_exec.c:1.408.2.3
--- src/sys/kern/kern_exec.c:1.408.2.2 Sat Jan 17 12:10:55 2015
+++ src/sys/kern/kern_exec.c Tue Apr 14 05:12:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.408.2.2 2015/01/17 12:10:55 martin Exp $ */
+/* $NetBSD: kern_exec.c,v 1.408.2.3 2015/04/14 05:12:17 snj 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.408.2.2 2015/01/17 12:10:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.408.2.3 2015/04/14 05:12:17 snj Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -673,7 +673,7 @@ execve_loadvm(struct lwp *l, const char
epp->ep_emul_arg_free = NULL;
memset(&epp->ep_vmcmds, 0, sizeof(epp->ep_vmcmds));
epp->ep_vap = &data->ed_attr;
- epp->ep_flags = 0;
+ epp->ep_flags = (p->p_flag & PK_32) ? EXEC_FROM32 : 0;
MD_TOPDOWN_INIT(epp);
epp->ep_emul_root = NULL;
epp->ep_interp = NULL;
@@ -1335,9 +1335,15 @@ execve1(struct lwp *l, const char *path,
}
static size_t
+fromptrsz(const struct exec_package *epp)
+{
+ return (epp->ep_flags & EXEC_FROM32) ? sizeof(int) : sizeof(char *);
+}
+
+static size_t
ptrsz(const struct exec_package *epp)
{
- return (epp->ep_flags & EXEC_32) ? sizeof(int) : sizeof(char *);
+ return (epp->ep_flags & EXEC_32) ? sizeof(int) : sizeof(char *);
}
static size_t
@@ -1508,7 +1514,7 @@ copyinargs(struct execve_data * restrict
return EINVAL;
}
if (epp->ep_flags & EXEC_SKIPARG)
- args = (const void *)((const char *)args + ptrsz(epp));
+ args = (const void *)((const char *)args + fromptrsz(epp));
i = 0;
error = copyinargstrs(data, args, fetch_element, &dp, &i, ktr_execarg);
if (error != 0) {
Index: src/sys/sys/exec.h
diff -u src/sys/sys/exec.h:1.145 src/sys/sys/exec.h:1.145.4.1
--- src/sys/sys/exec.h:1.145 Thu Mar 6 09:30:37 2014
+++ src/sys/sys/exec.h Tue Apr 14 05:12:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.h,v 1.145 2014/03/06 09:30:37 matt Exp $ */
+/* $NetBSD: exec.h,v 1.145.4.1 2015/04/14 05:12:17 snj Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -229,6 +229,7 @@ struct exec_package {
#define EXEC_32 0x0020 /* 32-bit binary emulation */
#define EXEC_FORCEAUX 0x0040 /* always use ELF AUX vector */
#define EXEC_TOPDOWN_VM 0x0080 /* may use top-down VM layout */
+#define EXEC_FROM32 0x0100 /* exec'ed from 32-bit binary */
struct exec_vmcmd {
int (*ev_proc)(struct lwp *, struct exec_vmcmd *);
