d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow an application that updates only the ELF Ehdr to work.

Browse Source 
Obtained from:	elftoolchain
MFC after:		1 month
This commit is contained in:
Kai Wang 2010-07-21 09:47:14 +00:00
parent f44d4dafb4
commit 7384c87800
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libelf/_libelf.h
View File

@ -176,6 +176,7 @@ void (*_libelf_get_translator(Elf_Type _t, int _direction, int _elfclass))
void *_libelf_getphdr(Elf *_e, int _elfclass);
void *_libelf_getshdr(Elf_Scn *_scn, int _elfclass);
void _libelf_init_elf(Elf *_e, Elf_Kind _kind);
int _libelf_load_scn(Elf *e, void *ehdr);
int _libelf_malign(Elf_Type _t, int _elfclass);
size_t _libelf_msize(Elf_Type _t, int _elfclass, unsigned int _version);
void *_libelf_newphdr(Elf *_e, int _elfclass, size_t _count);

2
lib/libelf/elf_scn.c
View File

@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
/*
* Load an ELF section table and create a list of Elf_Scn structures.
*/
static int
int
_libelf_load_scn(Elf *e, void *ehdr)
{
int ec, swapbytes;

12
lib/libelf/elf_update.c
View File

@ -472,6 +472,11 @@ _libelf_resync_elf(Elf *e)
* file.
*/
if (e->e_cmd != ELF_C_WRITE &&
(e->e_flags & LIBELF_F_SHDRS_LOADED) == 0 &&
_libelf_load_scn(e, ehdr) == 0)
return ((off_t) -1);
if ((rc = _libelf_resync_sections(e, rc)) < 0)
return ((off_t) -1);
@ -726,14 +731,9 @@ _libelf_write_elf(Elf *e, off_t newsize)
assert(phoff % _libelf_falign(ELF_T_PHDR, ec) == 0);
assert(fsz > 0);
src.d_buf = _libelf_getphdr(e, ec);
src.d_version = dst.d_version = e->e_version;
src.d_type = ELF_T_PHDR;
if (ec == ELFCLASS32)
src.d_buf = e->e_u.e_elf.e_phdr.e_phdr32;
else
src.d_buf = e->e_u.e_elf.e_phdr.e_phdr64;
src.d_size = phnum * _libelf_msize(ELF_T_PHDR, ec,
e->e_version);