aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2007-10-17 02:30:12 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:00 -0400
commit4f9a58d75bfe82ab2b8ba5b8506dfb190a267834 (patch)
tree791843f8cd609cb626a65c4004009084d87170d4 /include/asm-ia64
parentf77e34987070a20e4b3e06b868cb39eb73670467 (diff)
increase AT_VECTOR_SIZE to terminate saved_auxv properly
include/asm-powerpc/elf.h has 6 entries in ARCH_DLINFO. fs/binfmt_elf.c has 14 unconditional NEW_AUX_ENT entries and 2 conditional NEW_AUX_ENT entries. So in the worst case, saved_auxv does not get an AT_NULL entry at the end. The saved_auxv array must be terminated with an AT_NULL entry. Make the size of mm_struct->saved_auxv arch dependend, based on the number of ARCH_DLINFO entries. Signed-off-by: Olaf Hering <olh@suse.de> Cc: Roland McGrath <roland@redhat.com> Cc: Jakub Jelinek <jakub@redhat.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/elf.h1
-rw-r--r--include/asm-ia64/system.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-ia64/elf.h b/include/asm-ia64/elf.h
index 25f9835d5459..f10e29b60b00 100644
--- a/include/asm-ia64/elf.h
+++ b/include/asm-ia64/elf.h
@@ -192,6 +192,7 @@ extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);
192 192
193#define GATE_EHDR ((const struct elfhdr *) GATE_ADDR) 193#define GATE_EHDR ((const struct elfhdr *) GATE_ADDR)
194 194
195/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */
195#define ARCH_DLINFO \ 196#define ARCH_DLINFO \
196do { \ 197do { \
197 extern char __kernel_syscall_via_epc[]; \ 198 extern char __kernel_syscall_via_epc[]; \
diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h
index 91bb8e00066c..595112bca3cc 100644
--- a/include/asm-ia64/system.h
+++ b/include/asm-ia64/system.h
@@ -32,6 +32,8 @@
32#include <linux/kernel.h> 32#include <linux/kernel.h>
33#include <linux/types.h> 33#include <linux/types.h>
34 34
35#define AT_VECTOR_SIZE_ARCH 2 /* entries in ARCH_DLINFO */
36
35struct pci_vector_struct { 37struct pci_vector_struct {
36 __u16 segment; /* PCI Segment number */ 38 __u16 segment; /* PCI Segment number */
37 __u16 bus; /* PCI Bus number */ 39 __u16 bus; /* PCI Bus number */