diff options
| author | Josh Poimboeuf <jpoimboe@kernel.org> | 2023-05-30 10:21:03 -0700 |
|---|---|---|
| committer | Josh Poimboeuf <jpoimboe@kernel.org> | 2023-06-07 10:03:20 -0700 |
| commit | e0a9349b4c590145c6a83e6c9f7701cec42debbd (patch) | |
| tree | c687b29b9e393fb9892da91a64f0adea575f6831 /tools/objtool | |
| parent | caa4a6b74b405ddaea40e2946cc3983aac96451d (diff) | |
objtool: Allocate relocs in advance for new rela sections
Similar to read_relocs(), allocate the reloc structs all together in an
array rather than allocating them one at a time.
Link: https://lore.kernel.org/r/5332d845c5a2d6c2d052075b381bfba8bcb67ed5.1685464332.git.jpoimboe@kernel.org
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Diffstat (limited to 'tools/objtool')
| -rw-r--r-- | tools/objtool/elf.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index 8d53f18a9502..5f69d4590117 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -814,7 +814,7 @@ static struct reloc *elf_init_reloc(struct elf *elf, struct section *rsec, unsigned long offset, struct symbol *sym, s64 addend, unsigned int type) { - struct reloc *reloc; + struct reloc *reloc, empty = { 0 }; if (reloc_idx >= rsec->sh.sh_size / elf_rela_size(elf)) { WARN("%s: bad reloc_idx %u for %s with size 0x%lx", @@ -822,12 +822,13 @@ static struct reloc *elf_init_reloc(struct elf *elf, struct section *rsec, return NULL; } - reloc = malloc(sizeof(*reloc)); - if (!reloc) { - perror("malloc"); + reloc = &rsec->reloc_data[reloc_idx]; + + if (memcmp(reloc, &empty, sizeof(empty))) { + WARN("%s: %s: reloc %d already initialized!", + __func__, rsec->name, reloc_idx); return NULL; } - memset(reloc, 0, sizeof(*reloc)); reloc->idx = reloc_idx; reloc->sec = rsec; @@ -1185,6 +1186,13 @@ static struct section *elf_create_rela_section(struct elf *elf, rsec->sh.sh_info = sec->idx; rsec->sh.sh_flags = SHF_INFO_LINK; + rsec->reloc_data = calloc(rsec->sh.sh_size / rsec->sh.sh_entsize, + sizeof(struct reloc)); + if (!rsec->reloc_data) { + perror("calloc"); + return NULL; + } + sec->rsec = rsec; rsec->base = sec; |