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

Commit ec0063b4 authored by Suleiman Souhlal's avatar Suleiman Souhlal Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Don't write out segments from vsyscall32 DSO if it is not mapped 



It's possible to get an invalid page fault in kernel mode when we try to
write out segments from vsyscall32 when dumping core for a 32bit process if
the vsyscall32 DSO is not mapped in its address space (which can happen if,
for example, ulimit -v 100 is run).

Signed-off-by: default avatarSuleiman Souhlal <suleiman@google.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 01ebb77b

arch/x86_64/ia32/ia32_binfmt.c

+31 −26
Original line number Diff line number Diff line
@@ -73,9 +73,11 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; 
 * Dumping its extra ELF program headers includes all the other information

 * a debugger needs to easily find how the vsyscall DSO was being used.

 */

#define ELF_CORE_EXTRA_PHDRS		(VSYSCALL32_EHDR->e_phnum)

#define ELF_CORE_EXTRA_PHDRS	(find_vma(current->mm, VSYSCALL32_BASE) ?     \

    (VSYSCALL32_EHDR->e_phnum) : 0)

#define ELF_CORE_WRITE_EXTRA_PHDRS					      \

do {									      \

	if (find_vma(current->mm, VSYSCALL32_BASE)) { 			      \

		const struct elf32_phdr *const vsyscall_phdrs =		      \

			(const struct elf32_phdr *) (VSYSCALL32_BASE	      \

						   + VSYSCALL32_EHDR->e_phoff);\
@@ -95,9 +97,11 @@ do { \ 
			phdr.p_paddr = 0; /* match other core phdrs */	      \

			DUMP_WRITE(&phdr, sizeof(phdr));		      \

		}							      \

	}								      \

} while (0)

#define ELF_CORE_WRITE_EXTRA_DATA					      \

do {									      \

	if (find_vma(current->mm, VSYSCALL32_BASE)) { 			      \

		const struct elf32_phdr *const vsyscall_phdrs =		      \

			(const struct elf32_phdr *) (VSYSCALL32_BASE	      \

						   + VSYSCALL32_EHDR->e_phoff);      \
@@ -107,6 +111,7 @@ do { \ 
				DUMP_WRITE((void *) (u64) vsyscall_phdrs[i].p_vaddr,\

				    PAGE_ALIGN(vsyscall_phdrs[i].p_memsz));   \

		}							      \

	}								      \

} while (0)



struct elf_siginfo