Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f9a58d7 authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds
Browse files

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: default avatarOlaf 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f77e3498

fs/binfmt_elf.c

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, 


	/* Create the ELF interpreter info */

	elf_info = (elf_addr_t *)current->mm->saved_auxv;

	/* update AT_VECTOR_SIZE_BASE if the number of NEW_AUX_ENT() changes */

#define NEW_AUX_ENT(id, val) \

	do { \

		elf_info[ei_index++] = id; \
@@ -185,6 +186,8 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, 
	/* 

	 * ARCH_DLINFO must come first so PPC can do its special alignment of

	 * AUXV.

	 * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT() in

	 * ARCH_DLINFO changes

	 */

	ARCH_DLINFO;

#endif

include/asm-alpha/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ extern int alpha_l1d_cacheshape; 
extern int alpha_l2_cacheshape;

extern int alpha_l3_cacheshape;



/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */

#define ARCH_DLINFO						\

  do {								\

    NEW_AUX_ENT(AT_L1I_CACHESHAPE, alpha_l1i_cacheshape);	\

include/asm-alpha/system.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 


#ifndef __ASSEMBLY__

#include <linux/kernel.h>

#define AT_VECTOR_SIZE_ARCH 4 /* entries in ARCH_DLINFO */



/*

 * This is the logout header that should be common to all platforms

include/asm-ia64/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *); 


#define GATE_EHDR	((const struct elfhdr *) GATE_ADDR)



/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */

#define ARCH_DLINFO								\

do {										\

	extern char __kernel_syscall_via_epc[];					\

include/asm-ia64/system.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include <linux/kernel.h>

#include <linux/types.h>



#define AT_VECTOR_SIZE_ARCH 2 /* entries in ARCH_DLINFO */



struct pci_vector_struct {

	__u16 segment;	/* PCI Segment number */

	__u16 bus;	/* PCI Bus number */