RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2024-12-14 01:14:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206 from jpoimboe/symtab-sh-info

Browse Source 
create-diff-object: fix symtab sh_info field
This commit is contained in:
Seth Jennings 2014-05-23 14:25:54 -05:00
commit 9261bcc642
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kpatch-build/create-diff-object.c
View File

@ -1268,7 +1268,7 @@ void kpatch_create_symtab(struct kpatch_elf *kelf)
struct symbol *sym; struct symbol *sym;
char *buf; char *buf;
size_t size; size_t size;
int nr = 0, offset = 0; int nr = 0, offset = 0, nr_local = 0;
symtab = find_section_by_name(&kelf->sections, ".symtab"); symtab = find_section_by_name(&kelf->sections, ".symtab");
if (!symtab) if (!symtab)
@ -1289,10 +1289,17 @@ void kpatch_create_symtab(struct kpatch_elf *kelf)
list_for_each_entry(sym, &kelf->symbols, list) { list_for_each_entry(sym, &kelf->symbols, list) {
memcpy(buf + offset, &sym->sym, symtab->sh.sh_entsize); memcpy(buf + offset, &sym->sym, symtab->sh.sh_entsize);
offset += symtab->sh.sh_entsize; offset += symtab->sh.sh_entsize;
if (is_local_sym(sym))
nr_local++;
} }
symtab->data->d_buf = buf; symtab->data->d_buf = buf;
symtab->data->d_size = size; symtab->data->d_size = size;
/* update symtab section header */
symtab->sh.sh_link = find_section_by_name(&kelf->sections, ".strtab")->index;
symtab->sh.sh_info = nr_local;
} }
void kpatch_create_patches_sections(struct kpatch_elf *kelf, void kpatch_create_patches_sections(struct kpatch_elf *kelf,
@ -1825,15 +1832,11 @@ int main(int argc, char *argv[])
kpatch_strip_unneeded_syms(kelf_out, vmlinux); kpatch_strip_unneeded_syms(kelf_out, vmlinux);
kpatch_reindex_elements(kelf_out); kpatch_reindex_elements(kelf_out);
/* update symtab section header */
symtab = find_section_by_name(&kelf_out->sections, ".symtab");
symtab->sh.sh_link = find_section_by_name(&kelf_out->sections, ".strtab")->index;
symtab->sh.sh_info = find_section_by_name(&kelf_out->sections, ".shstrtab")->index;
/* /*
* Update rela section headers and rebuild the rela section data * Update rela section headers and rebuild the rela section data
* buffers from the relas lists. * buffers from the relas lists.
*/ */
symtab = find_section_by_name(&kelf_out->sections, ".symtab");
list_for_each_entry(sec, &kelf_out->sections, list) { list_for_each_entry(sec, &kelf_out->sections, list) {
if (!is_rela_section(sec)) if (!is_rela_section(sec))
continue; continue;