[src/trunk]: src/sys/kern if emulation uses elf32_copyargs(), it shouldn't us...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cad3dbb08777
branches:  trunk
changeset: 543202:cad3dbb08777
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Feb 19 09:44:42 2003 +0000

description:
if emulation uses elf32_copyargs(), it shouldn't use it's own idea
of how many AUX arguments are actually passed

this fixes PR kern/20423 by Shingo WATANABE

diffstat:

 sys/kern/exec_conf.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 145abe404598 -r cad3dbb08777 sys/kern/exec_conf.c
--- a/sys/kern/exec_conf.c      Wed Feb 19 09:21:15 2003 +0000
+++ b/sys/kern/exec_conf.c      Wed Feb 19 09:44:42 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_conf.c,v 1.78 2002/11/30 13:19:37 jdolecek Exp $  */
+/*     $NetBSD: exec_conf.c,v 1.79 2003/02/19 09:44:42 jdolecek Exp $  */
 
 /*
  * Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_conf.c,v 1.78 2002/11/30 13:19:37 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_conf.c,v 1.79 2003/02/19 09:44:42 jdolecek Exp $");
 
 #include "opt_execfmt.h"
 #include "opt_compat_freebsd.h"
@@ -344,7 +344,7 @@
          { ELF32NAME2(freebsd,probe) },
          &emul_freebsd,
          EXECSW_PRIO_ANY,
-         FREEBSD_ELF_AUX_ARGSIZ,
+         howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof(Elf32_Addr)),
          elf32_copyargs,
          NULL,
          coredump_elf32 },
@@ -407,7 +407,7 @@
          { ELF32NAME2(ibcs2,probe) },
          &emul_ibcs2,
          EXECSW_PRIO_ANY,
-         IBCS2_ELF_AUX_ARGSIZ,
+         howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof (Elf32_Addr)),
          elf32_copyargs,
          NULL,
          coredump_elf32 },