diff options
| author | Renato Botelho <renato@netgate.com> | 2018-05-18 14:53:44 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2018-05-18 14:53:44 -0300 |
| commit | 64f021cd075bbcb3042539dcebc63e7d335ec2c0 (patch) | |
| tree | 1a64375406a7b5976f98eaf4cf19f00cf2931dd1 /contrib/elftoolchain/readelf/readelf.c | |
| parent | 8f29f1de284afe0ec8987780d5404a3e1a31712a (diff) | |
| parent | eb64daea863b1fe3320e10c6c72cbfe7e9ce967b (diff) | |
| download | FreeBSD-src-64f021cd075bbcb3042539dcebc63e7d335ec2c0.zip FreeBSD-src-64f021cd075bbcb3042539dcebc63e7d335ec2c0.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'contrib/elftoolchain/readelf/readelf.c')
| -rw-r--r-- | contrib/elftoolchain/readelf/readelf.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index b4d0790..bed7919 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -2377,11 +2377,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 |
