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

ELF image can have several PT_NOTE program headers. Look for the ELF

Browse Source 
brand note in each header, instead of using only first one.

Reviewed by:	kan
Tested by:	andrew (arm), flo (sparc64)
MFC after:	3 weeks
This commit is contained in:
Konstantin Belousov 2012-03-11 19:38:49 +00:00
parent bbf53c35ea
commit 1a9c7dec1f
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sys/kern/imgact_elf.c
View File

@ -1549,32 +1549,14 @@ __elfN(putnote)(void *dst, size_t *off, const char *name, int type,
*off += roundup2(note.n_descsz, sizeof(Elf_Size));
}
/*
* Try to find the appropriate ABI-note section for checknote,
* fetch the osreldate for binary from the ELF OSABI-note. Only the
* first page of the image is searched, the same as for headers.
*/
static boolean_t
__elfN(check_note)(struct image_params *imgp, Elf_Brandnote *checknote,
int32_t *osrel)
__elfN(parse_notes)(struct image_params *imgp, Elf_Brandnote *checknote,
int32_t *osrel, const Elf_Phdr *pnote)
{
const Elf_Note *note, *note0, *note_end;
const Elf_Phdr *phdr, *pnote;
const Elf_Ehdr *hdr;
const char *note_name;
int i;
pnote = NULL;
hdr = (const Elf_Ehdr *)imgp->image_header;
phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff);
for (i = 0; i < hdr->e_phnum; i++) {
if (phdr[i].p_type == PT_NOTE) {
pnote = &phdr[i];
break;
}
}
if (pnote == NULL || pnote->p_offset >= PAGE_SIZE ||
pnote->p_offset + pnote->p_filesz >= PAGE_SIZE)
return (FALSE);
@ -1612,6 +1594,31 @@ nextnote:
return (FALSE);
}
/*
* Try to find the appropriate ABI-note section for checknote,
* fetch the osreldate for binary from the ELF OSABI-note. Only the
* first page of the image is searched, the same as for headers.
*/
static boolean_t
__elfN(check_note)(struct image_params *imgp, Elf_Brandnote *checknote,
int32_t *osrel)
{
const Elf_Phdr *phdr;
const Elf_Ehdr *hdr;
int i;
hdr = (const Elf_Ehdr *)imgp->image_header;
phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff);
for (i = 0; i < hdr->e_phnum; i++) {
if (phdr[i].p_type == PT_NOTE &&
__elfN(parse_notes)(imgp, checknote, osrel, &phdr[i]))
return (TRUE);
}
return (FALSE);
}
/*
* Tell kern_execve.c about it, with a little help from the linker.
*/