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

Handle thread-local storage (TLS) segments correctly when

Browse Source 
copying (objcopy) and displaying (readelf) them.

PR:		227552
Submitted by:	kaiw (maintainer)
Reported by:	jachmann@unitix.org
Reviewed by:	phil
MFC after:	1 day
This commit is contained in:
phil 2018-05-14 05:21:18 +00:00
parent ec32568d63
commit 58ce5b116e
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/elftoolchain/elfcopy/elfcopy.h
View File

@ -127,6 +127,7 @@ struct section {
uint64_t cap; /* section capacity */
uint64_t align; /* section alignment */
uint64_t type; /* section type */
uint64_t flags; /* section flags */
uint64_t vma; /* section virtual addr */
uint64_t lma; /* section load addr */
uint64_t pad_sz;/* section padding size */

1
contrib/elftoolchain/elfcopy/sections.c
View File

@ -411,6 +411,7 @@ create_scn(struct elfcopy *ecp)
s->sz = ish.sh_size;
s->align = ish.sh_addralign;
s->type = ish.sh_type;
s->flags = ish.sh_flags;
s->vma = ish.sh_addr;
/*

2
contrib/elftoolchain/elfcopy/segments.c
View File

@ -79,6 +79,8 @@ add_to_inseg_list(struct elfcopy *ecp, struct section *s)
continue;
if (s->vma + s->sz > seg->vaddr + seg->msz)
continue;
if (seg->type == PT_TLS && ((s->flags & SHF_TLS) == 0))
continue;
insert_to_inseg_list(seg, s);
if (seg->type == PT_LOAD)

19
contrib/elftoolchain/readelf/readelf.c
View File

@ -2378,11 +2378,22 @@ dump_phdr(struct readelf *re)
}
printf(" %2.2d ", i);
/* skip NULL section. */
for (j = 1; (size_t)j < re->shnum; j++)
if (re->sl[j].addr >= phdr.p_vaddr &&
re->sl[j].addr + re->sl[j].sz <=
for (j = 1; (size_t)j < re->shnum; j++) {
if (re->sl[j].off < phdr.p_offset)
continue;
if (re->sl[j].off + re->sl[j].sz >
phdr.p_offset + phdr.p_filesz &&
re->sl[j].type != SHT_NOBITS)
continue;
if (re->sl[j].addr < phdr.p_vaddr ||
re->sl[j].addr + re->sl[j].sz >
phdr.p_vaddr + phdr.p_memsz)
printf("%s ", re->sl[j].name);
continue;
if (phdr.p_type == PT_TLS &&
(re->sl[j].flags & SHF_TLS) == 0)
continue;
printf("%s ", re->sl[j].name);
}
printf("\n");
}
#undef PH_HDR