Fri Feb 21 07:53:53 2014 UTC ()

Increase LINUX32_ELF_AUX_ENTRIES to avoid overrun in linux32/. Also,
add comments and KASSERTs to make sure people don't forget to increase
XX_AUX_ENTRIES's when adding vectors.

Reported by martin@ (CV), with suggestions from chs@.

ok martin@ chs@


(maxv)

diff -r1.20 -r1.21 src/sys/compat/linux/arch/amd64/linux_exec_machdep.c
diff -r1.50 -r1.51 src/sys/compat/linux/common/linux_exec.h
diff -r1.88 -r1.89 src/sys/compat/linux/common/linux_exec_elf32.c
diff -r1.5 -r1.6 src/sys/compat/linux32/arch/amd64/linux32_exec.h
diff -r1.14 -r1.15 src/sys/compat/linux32/common/linux32_exec_elf32.c

--- src/sys/compat/linux/arch/amd64/linux_exec_machdep.c 2013/11/18 01:32:22	1.20

+++ src/sys/compat/linux/arch/amd64/linux_exec_machdep.c 2014/02/21 07:53:53	1.21

@@ -1,4 +1,4 @@
-/*	$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
@@ -32,7 +32,7 @@
  */
 
 #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
 
@@ -233,13 +233,8 @@
 	esd.ai[i].a_type = AT_NULL;
 	esd.ai[i++].a_v = 0;
 
-#ifdef DEBUG_LINUX
-	if (i != LINUX_ELF_AUX_ENTRIES) {
-		printf("linux_elf64_copyargs: %d Aux entries\n", i);
-		return EINVAL;
-	}
-#endif
-		
+	KASSERT(i == LINUX_ELF_AUX_ENTRIES);
+
 	strcpy(esd.hw_platform, LINUX_PLATFORM); 
 
 	exec_free_emul_arg(pack);

--- src/sys/compat/linux/common/linux_exec.h 2014/02/09 16:41:42	1.50

+++ src/sys/compat/linux/common/linux_exec.h 2014/02/21 07:53:53	1.51

@@ -1,4 +1,4 @@
-/*	$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.
@@ -82,6 +82,7 @@
 #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

--- src/sys/compat/linux/common/linux_exec_elf32.c 2014/02/09 16:41:42	1.88

+++ src/sys/compat/linux/common/linux_exec_elf32.c 2014/02/21 07:53:53	1.89

@@ -1,4 +1,4 @@
-/*	$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.
@@ -35,7 +35,7 @@
  */
 
 #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 */
@@ -495,6 +495,7 @@
 	*stackp += len;
 
 	len = (a - ai) * sizeof(AuxInfo);
+	KASSERT(len <= LINUX_ELF_AUX_ENTRIES);
 	if ((error = copyout(ai, *stackp, len)) != 0)
 		return error;
 	*stackp += len;

--- src/sys/compat/linux32/arch/amd64/linux32_exec.h 2014/02/09 16:41:42	1.5

+++ src/sys/compat/linux32/arch/amd64/linux32_exec.h 2014/02/21 07:53:53	1.6

@@ -1,4 +1,4 @@
-/*	$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.
@@ -41,7 +41,8 @@
 
 #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 */

--- src/sys/compat/linux32/common/linux32_exec_elf32.c 2014/02/09 16:41:42	1.14

+++ src/sys/compat/linux32/common/linux32_exec_elf32.c 2014/02/21 07:53:53	1.15

@@ -1,4 +1,4 @@
-/*	$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.
@@ -31,7 +31,7 @@
  */
 
 #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
 
@@ -191,6 +191,8 @@
 	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++;
@@ -239,6 +241,7 @@
 #endif
 
 	len = (a - ai) * sizeof(AuxInfo);
+	KASSERT(len <= LINUX32_ELF_AUX_ENTRIES);
 	if ((error = copyout(ai, *stackp, len)) != 0)
 		return error;
 	*stackp += len;