Module Name: src
Committed By: maxv
Date: Fri Feb 21 07:53:53 UTC 2014
Modified Files:
src/sys/compat/linux/arch/amd64: linux_exec_machdep.c
src/sys/compat/linux/common: linux_exec.h linux_exec_elf32.c
src/sys/compat/linux32/arch/amd64: linux32_exec.h
src/sys/compat/linux32/common: linux32_exec_elf32.c
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/sys/compat/linux/arch/amd64/linux_exec_machdep.c
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/linux/common/linux_exec.h
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/common/linux_exec_elf32.c
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/linux32/arch/amd64/linux32_exec.h
cvs rdiff -u -r1.14 -r1.15 src/sys/compat/linux32/common/linux32_exec_elf32.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/amd64/linux_exec_machdep.c
diff -u src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.20 src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.21
--- src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.20 Mon Nov 18 01:32:22 2013
+++ src/sys/compat/linux/arch/amd64/linux_exec_machdep.c Fri Feb 21 07:53:53 2014
@@ -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 @@ ELFNAME2(linux,copyargs)(struct lwp *l,
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);
Index: src/sys/compat/linux/common/linux_exec.h
diff -u src/sys/compat/linux/common/linux_exec.h:1.50 src/sys/compat/linux/common/linux_exec.h:1.51
--- src/sys/compat/linux/common/linux_exec.h:1.50 Sun Feb 9 16:41:42 2014
+++ src/sys/compat/linux/common/linux_exec.h Fri Feb 21 07:53:53 2014
@@ -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
Index: src/sys/compat/linux/common/linux_exec_elf32.c
diff -u src/sys/compat/linux/common/linux_exec_elf32.c:1.88 src/sys/compat/linux/common/linux_exec_elf32.c:1.89
--- src/sys/compat/linux/common/linux_exec_elf32.c:1.88 Sun Feb 9 16:41:42 2014
+++ src/sys/compat/linux/common/linux_exec_elf32.c Fri Feb 21 07:53:53 2014
@@ -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 @@ ELFNAME2(linux,copyargs)(struct lwp *l,
*stackp += len;
len = (a - ai) * sizeof(AuxInfo);
+ KASSERT(len <= LINUX_ELF_AUX_ENTRIES);
if ((error = copyout(ai, *stackp, len)) != 0)
return error;
*stackp += len;
Index: src/sys/compat/linux32/arch/amd64/linux32_exec.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_exec.h:1.5 src/sys/compat/linux32/arch/amd64/linux32_exec.h:1.6
--- src/sys/compat/linux32/arch/amd64/linux32_exec.h:1.5 Sun Feb 9 16:41:42 2014
+++ src/sys/compat/linux32/arch/amd64/linux32_exec.h Fri Feb 21 07:53:53 2014
@@ -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 */
Index: src/sys/compat/linux32/common/linux32_exec_elf32.c
diff -u src/sys/compat/linux32/common/linux32_exec_elf32.c:1.14 src/sys/compat/linux32/common/linux32_exec_elf32.c:1.15
--- src/sys/compat/linux32/common/linux32_exec_elf32.c:1.14 Sun Feb 9 16:41:42 2014
+++ src/sys/compat/linux32/common/linux32_exec_elf32.c Fri Feb 21 07:53:53 2014
@@ -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 @@ linux32_elf32_copyargs(struct lwp *l, st
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 @@ linux32_elf32_copyargs(struct lwp *l, st
#endif
len = (a - ai) * sizeof(AuxInfo);
+ KASSERT(len <= LINUX32_ELF_AUX_ENTRIES);
if ((error = copyout(ai, *stackp, len)) != 0)
return error;
*stackp += len;
