Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If we are writing PN_XNUM or more phdrs, include one section header and

Browse Source 
encode the real # of sections in its sh_info.
This commit is contained in:
matt 2014-04-02 17:19:49 +00:00
parent 95e41b89b5
commit 790372329e
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/kern/core_elf32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: core_elf32.c,v 1.44 2014/01/05 09:13:18 dsl Exp $ */
/* $NetBSD: core_elf32.c,v 1.45 2014/04/02 17:19:49 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.44 2014/01/05 09:13:18 dsl Exp $");
__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.45 2014/04/02 17:19:49 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_coredump.h"
@ -106,6 +106,7 @@ int
ELFNAMEEND(coredump)(struct lwp *l, struct coredump_iostate *cookie)
{
Elf_Ehdr ehdr;
Elf_Shdr shdr;
Elf_Phdr *psections;
size_t psectionssize;
int npsections;
@ -165,14 +166,22 @@ ELFNAMEEND(coredump)(struct lwp *l, struct coredump_iostate *cookie)
ehdr.e_machine = ELFDEFNNAME(MACHDEP_ID);
ehdr.e_version = EV_CURRENT;
ehdr.e_entry = 0;
ehdr.e_phoff = sizeof(ehdr);
ehdr.e_shoff = 0;
ehdr.e_flags = 0;
ehdr.e_ehsize = sizeof(ehdr);
ehdr.e_phentsize = sizeof(Elf_Phdr);
ehdr.e_phnum = npsections;
ehdr.e_shentsize = 0;
ehdr.e_shnum = 0;
if (npsections < PN_XNUM) {
ehdr.e_phnum = npsections;
ehdr.e_shentsize = 0;
ehdr.e_shnum = 0;
ehdr.e_shoff = 0;
ehdr.e_phoff = sizeof(ehdr);
} else {
ehdr.e_phnum = PN_XNUM;
ehdr.e_shentsize = sizeof(Elf_Shdr);
ehdr.e_shnum = 1;
ehdr.e_shoff = sizeof(ehdr);
ehdr.e_phoff = sizeof(ehdr) + sizeof(shdr);
}
ehdr.e_shstrndx = 0;
#ifdef ELF_MD_COREDUMP_SETUP
@ -184,8 +193,19 @@ ELFNAMEEND(coredump)(struct lwp *l, struct coredump_iostate *cookie)
if (error)
goto out;
/* Write out sections, if needed */
if (npsections >= PN_XNUM) {
memset(&shdr, 0, sizeof(shdr));
shdr.sh_type = SHT_NULL;
shdr.sh_info = npsections;
error = coredump_write(cookie, UIO_SYSSPACE, &shdr,
sizeof(shdr));
if (error)
goto out;
}
psectionssize = npsections * sizeof(*psections);
notestart = sizeof(ehdr) + psectionssize;
notestart = ehdr.e_phoff + psectionssize;
psections = kmem_zalloc(psectionssize, KM_SLEEP);