 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_exec_machdep.c,v 1.20 2013/11/18 01:32:22 chs Exp $ */
+/*	$NetBSD: linux_exec_machdep.c,v 1.21 2014/02/21 07:53:53 maxv Exp $ */
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -22,27 +22,27 @@
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.20 2013/11/18 01:32:22 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.21 2014/02/21 07:53:53 maxv Exp $");
 #define ELFSIZE 64
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/exec_elf.h>
 #include <sys/vnode.h>
 #include <sys/lwp.h>
 @@ -223,33 +223,28 @@ ELFNAME2(linux,copyargs)(struct lwp *l,
 	esd.ai[i].a_type = LINUX_AT_PLATFORM;
 	esd.ai[i++].a_v = (Elf_Addr)&esdp->hw_platform[0];
 	esd.ai[i].a_type = LINUX_AT_RANDOM;
 	esd.ai[i++].a_v = (Elf_Addr)&esdp->randbytes[0];
 	esd.randbytes[0] = random();
 	esd.randbytes[1] = random();
 	esd.randbytes[2] = random();
 	esd.randbytes[3] = random();
 	esd.ai[i].a_type = AT_NULL;
 	esd.ai[i++].a_v = 0;
-#ifdef DEBUG_LINUX
+	KASSERT(i == LINUX_ELF_AUX_ENTRIES);
 	if (i != LINUX_ELF_AUX_ENTRIES) {
 		printf("linux_elf64_copyargs: %d Aux entries\n", i);
 		return EINVAL;
 #endif
 	strcpy(esd.hw_platform, LINUX_PLATFORM);
 	exec_free_emul_arg(pack);
 	/*
 	 * Copy out the ELF auxiliary table and hw platform name
 	 */
 	if ((error = copyout(&esd, esdp, sizeof(esd))) != 0)
 		return error;
 	*stackp += sizeof(esd);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_exec.h,v 1.50 2014/02/09 16:41:42 chs Exp $	*/
+/*	$NetBSD: linux_exec.h,v 1.51 2014/02/21 07:53:53 maxv Exp $	*/
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -72,26 +72,27 @@
 #define LINUX_N_TXTADDR(x,m) ((m) == QMAGIC ? PAGE_SIZE : 0)
 #define LINUX__N_SEGMENT_ROUND(x) (((x) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
 #define LINUX__N_TXTENDADDR(x,m) (LINUX_N_TXTADDR(x,m)+(x).a_text)
 #define LINUX_N_DATADDR(x,m) \
     ((m)==OMAGIC? (LINUX__N_TXTENDADDR(x,m)) \
      : (LINUX__N_SEGMENT_ROUND (LINUX__N_TXTENDADDR(x,m))))
 #define LINUX_N_BSSADDR(x,m) (LINUX_N_DATADDR(x,m) + (x).a_data)
 #ifndef LINUX_MACHDEP_ELF_COPYARGS
 /* Counted from linux_exec_elf32.c */
 #define LINUX_ELF_AUX_ENTRIES	14
 #endif
 /*
  * From Linux's include/linux/elf.h
  */
 #define LINUX_AT_UID		11	/* real uid */
 #define LINUX_AT_EUID		12	/* effective uid */
 #define LINUX_AT_GID		13	/* real gid */
 #define LINUX_AT_EGID		14	/* effective gid */
 #define LINUX_AT_PLATFORM	15	/* CPU string for optimizations */
 #define LINUX_AT_HWCAP		16	/* arch dependent CPU capabilities */
 #define LINUX_AT_CLKTCK		17	/* frequency times() increments */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_exec_elf32.c,v 1.88 2014/02/09 16:41:42 chs Exp $	*/
+/*	$NetBSD: linux_exec_elf32.c,v 1.89 2014/02/21 07:53:53 maxv Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas, Frank van der Linden, Eric Haszlakiewicz and
  * Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * based on exec_aout.c, sunos_exec.c and svr4_exec.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.88 2014/02/09 16:41:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.89 2014/02/21 07:53:53 maxv Exp $");
 #ifndef ELFSIZE
 /* XXX should die */
 #define	ELFSIZE		32
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 @@ -485,20 +485,21 @@ ELFNAME2(linux,copyargs)(struct lwp *l,
 	a++;
 	randbytes[0] = cprng_strong32();
 	randbytes[1] = cprng_strong32();
 	randbytes[2] = cprng_strong32();
 	randbytes[3] = cprng_strong32();
 	len = sizeof(randbytes);
 	if ((error = copyout(randbytes, *stackp, len)) != 0)
 		return error;
 	*stackp += len;
 	len = (a - ai) * sizeof(AuxInfo);
 	KASSERT(len <= LINUX_ELF_AUX_ENTRIES);
 	if ((error = copyout(ai, *stackp, len)) != 0)
 		return error;
 	*stackp += len;
 	return 0;
+}
 #endif /* !LINUX_MACHDEP_ELF_COPYARGS */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_exec.h,v 1.5 2014/02/09 16:41:42 chs Exp $ */
+/*	$NetBSD: linux32_exec.h,v 1.6 2014/02/21 07:53:53 maxv Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -31,27 +31,28 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _AMD64_LINUX32_EXEC_H
 #define _AMD64_LINUX32_EXEC_H
 #include <sys/exec_elf.h>
 #define LINUX32_M_I386		100
 #define LINUX32_MID_MACHINE	LINUX_M_I386
 #define LINUX32_USRSTACK	0xC0000000
 #define LINUX32_DEBUGLINK_SIGNATURE	1
-#define LINUX32_ELF_AUX_ENTRIES 14
+/* Counted from common/linux32_exec_elf32.c */
 #define LINUX32_ELF_AUX_ENTRIES 15
 #define LINUX32_RANDOM_BYTES 16		/* 16 bytes for AT_RANDOM */
 #if 0
 /* Hardware platform identifier string */
 #define LINUX32_PLATFORM "i686"
 #define LINUX32_CPUCAP (cpu_feature[0])
 /* vsyscall assembly */
 static char linux32_kernel_vsyscall[] = {
 x55,				/* push   %ebp */		\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_exec_elf32.c,v 1.14 2014/02/09 16:41:42 chs Exp $ */
+/*	$NetBSD: linux32_exec_elf32.c,v 1.15 2014/02/21 07:53:53 maxv Exp $ */
 /*-
  * Copyright (c) 1995, 1998, 2000, 2001,2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas, Frank van der Linden, Eric Haszlakiewicz and
  * Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_exec_elf32.c,v 1.14 2014/02/09 16:41:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_exec_elf32.c,v 1.15 2014/02/21 07:53:53 maxv Exp $");
 #define	ELFSIZE		32
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/resourcevar.h>
 #include <sys/signal.h>
 @@ -181,26 +181,28 @@ linux32_elf32_copyargs(struct lwp *l, st
 	a->a_v = ((vap->va_mode & S_ISGID) ?
 	    vap->va_gid : kauth_cred_getegid(l->l_cred));
 	a++;
 	a->a_type = LINUX_AT_SECURE;
 	a->a_v = 0;
 	a++;
 	a->a_type = LINUX_AT_RANDOM;
 	a->a_v = NETBSD32PTR32I(*stackp);
 	a++;
 #if 0
 	/* XXX: increase LINUX32_ELF_AUX_ENTRIES if we enable those things */
 	a->a_type = LINUX_AT_SYSINFO;
 	a->a_v = NETBSD32PTR32I(&esdp->kernel_vsyscall[0]);
 	a++;
 	a->a_type = LINUX_AT_SYSINFO_EHDR;
 	a->a_v = NETBSD32PTR32I(&esdp->elfhdr);
 	a++;
 	a->a_type = LINUX_AT_HWCAP;
 	a->a_v = LINUX32_CPUCAP;
 	a++;
 	a->a_type = LINUX_AT_PLATFORM;
 @@ -229,19 +231,20 @@ linux32_elf32_copyargs(struct lwp *l, st
 	memcpy(&esd.elfhdr, eh, sizeof(*eh));
 	strcpy(esd.hw_platform, LINUX32_PLATFORM);
 	/*
 	 * Copy out the ELF auxiliary table and hw platform name
 	 */
 	if ((error = copyout(&esd, esdp, sizeof(esd))) != 0)
 		return error;
 	*stackp += sizeof(esd);
 #endif
 	len = (a - ai) * sizeof(AuxInfo);
 	KASSERT(len <= LINUX32_ELF_AUX_ENTRIES);
 	if ((error = copyout(ai, *stackp, len)) != 0)
 		return error;
 	*stackp += len;
 	return 0;
+}