summaryrefslogtreecommitdiff
path: root/sys/compat/ultrix/ultrix_misc.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-06-17 11:11:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-06-17 11:11:14 +0000
commit38db754b25174070ed136b30600e0bcc16dc5822 (patch)
tree6ede5e261dc3fa5116b6facb5742431e45bd2dea /sys/compat/ultrix/ultrix_misc.c
parent756200b35a82da5cf261e44482d92c2054bd2f30 (diff)
careful with stackgap handling in execve()
Diffstat (limited to 'sys/compat/ultrix/ultrix_misc.c')
-rw-r--r--sys/compat/ultrix/ultrix_misc.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index f32778caa8b..b79f6300c7e 100644
--- a/sys/compat/ultrix/ultrix_misc.c
+++ b/sys/compat/ultrix/ultrix_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ultrix_misc.c,v 1.11 1997/04/12 19:58:02 graichen Exp $ */
+/* $OpenBSD: ultrix_misc.c,v 1.12 1997/06/17 11:11:13 deraadt Exp $ */
/* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */
/*
@@ -591,10 +591,20 @@ ultrix_sys_execve(p, v, retval)
void *v;
register_t *retval;
{
- struct ultrix_sys_execve_args *uap = v;
-
- caddr_t sg = stackgap_init(p->p_emul);
+ struct ultrix_sys_execve_args /* {
+ syscallarg(char *) path;
+ syscallarg(char **) argv;
+ syscallarg(char **) envp;
+ } */ *uap = v;
+ struct sys_execve_args ap;
+ caddr_t sg;
+
+ sg = stackgap_init(p->p_emul);
ULTRIX_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
- return (sys_execve(p, (struct sys_execve_args *)&uap, retval));
+ SCARG(&ap, path) = SCARG(uap, path);
+ SCARG(&ap, argp) = SCARG(uap, argp);
+ SCARG(&ap, envp) = SCARG(uap, envp);
+
+ return (sys_execve(p, &ap, retval));
}