#include <libelfu/types.h>
-ELFU_BOOL elfu_segmentContainsSection(GElf_Phdr *phdr, Elf_Scn *scn);
+int elfu_segmentContainsSection(GElf_Phdr *phdr, GElf_Shdr *shdr);
#endif
#ifndef __LIBELFU_TYPES_H__
#define __LIBELFU_TYPES_H__
-typedef enum {
- ELFU_ERROR = -1,
- ELFU_FALSE = 0,
- ELFU_TRUE = 1
-} ELFU_BOOL;
+
#endif
#include <libelfu/libelfu.h>
-ELFU_BOOL elfu_segmentContainsSection(GElf_Phdr *phdr, Elf_Scn *scn)
+int elfu_segmentContainsSection(GElf_Phdr *phdr, GElf_Shdr *shdr)
{
- GElf_Shdr shdr;
-
-
- if (gelf_getshdr(scn, &shdr) != &shdr) {
- return ELFU_ERROR;
- }
-
- size_t secStart = shdr.sh_offset;
- size_t secEnd = shdr.sh_offset + shdr.sh_size;
+ size_t secStart = shdr->sh_offset;
+ size_t secEnd = shdr->sh_offset + shdr->sh_size;
size_t segStart = phdr->p_offset;
size_t segEnd = phdr->p_offset + phdr->p_memsz;
if (secStart < segStart || secEnd > segEnd) {
- return ELFU_FALSE;
+ return 0;
}
- return ELFU_TRUE;
+ return 1;
}
}
if (shdr.sh_offset == phdr->p_offset
- && elfu_segmentContainsSection(phdr, scn) == ELFU_TRUE) {
+ && elfu_segmentContainsSection(phdr, &shdr)) {
return scn;
}
+#include <stdio.h>
#include <stdlib.h>
#include <libelf.h>
scn = elf_getscn(e, 1);
while (scn) {
- if (elfu_segmentContainsSection(phdr, scn) == ELFU_TRUE) {
+ GElf_Shdr shdr;
+
+ if (gelf_getshdr(scn, &shdr) != &shdr) {
+ fprintf(stderr, "gelf_getshdr() failed: %s\n", elf_errmsg(-1));
+ continue;
+ }
+
+ if (elfu_segmentContainsSection(phdr, &shdr)) {
if (!last) {
last = scn;
} else {
GElf_Shdr shdrOld;
- GElf_Shdr shdrNew;
if (gelf_getshdr(last, &shdrOld) != &shdrOld) {
continue;
}
- if (gelf_getshdr(scn, &shdrNew) != &shdrNew) {
- continue;
- }
-
- if (shdrNew.sh_offset + shdrNew.sh_size
+ if (shdr.sh_offset + shdr.sh_size
> shdrOld.sh_offset + shdrOld.sh_size) {
// TODO: Check (leftover space in memory image) < (p_align)
last = scn;
void printSegmentsWithSection(Elf *e, Elf_Scn *scn)
{
GElf_Phdr phdr;
+ GElf_Shdr shdr;
int i;
size_t n;
+ if (gelf_getshdr(scn, &shdr) != &shdr) {
+ fprintf(stderr, "gelf_getshdr() failed: %s\n", elf_errmsg(-1));
+ return;
+ }
+
if (elf_getphdrnum(e, &n)) {
fprintf(stderr, "elf_getphdrnum() failed: %s\n", elf_errmsg(-1));
return;
}
for (i = 0; i < n; i++) {
- ELFU_BOOL isInSeg;
-
if (gelf_getphdr(e, i, &phdr) != &phdr) {
fprintf(stderr, "getphdr() failed for #%d: %s\n", i, elf_errmsg(-1));
continue;
}
- isInSeg = elfu_segmentContainsSection(&phdr, scn);
- if (isInSeg == ELFU_TRUE) {
+ if (elfu_segmentContainsSection(&phdr, &shdr)) {
printf(" %d %s\n", i, segmentTypeStr(phdr.p_type));
}
}
scn = elf_getscn(e, 0);
while (scn) {
- ELFU_BOOL isInSeg;
+ GElf_Shdr shdr;
- isInSeg = elfu_segmentContainsSection(phdr, scn);
- if (isInSeg == ELFU_TRUE) {
+ if (gelf_getshdr(scn, &shdr) != &shdr) {
+ fprintf(stderr, "gelf_getshdr() failed: %s\n", elf_errmsg(-1));
+ continue;
+ }
+
+ if (elfu_segmentContainsSection(phdr, &shdr)) {
printf(" %10u %s\n", elf_ndxscn(scn), elfu_sectionName(e, scn));
}