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

Merge pull request #93 from spartacus06/fixes

Browse Source 
check for changed sections that are not included
This commit is contained in:
Josh Poimboeuf 2014-03-27 19:30:25 -07:00
commit fcd8d96b08
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,6 +720,16 @@ void kpatch_dump_kelf(struct kpatch_elf *kelf)
}
}
void kpatch_verify_patchability(struct kpatch_elf *kelf)
{
struct section *sec;
int i;
for_each_section(i, sec, &kelf->sections)
if (sec->status == CHANGED && !sec->include)
DIFF_FATAL("changed section %s not selected for inclusion", sec->name);
}
int kpatch_find_changed_functions(struct kpatch_elf *kelf)
{
struct symbol *sym;
@ -782,6 +792,20 @@ out:
return;
}
void kpatch_include_standard_sections(struct kpatch_elf *kelf)
{
struct section *sec;
int i;
for_each_section(i, sec, &kelf->sections) {
/* include these sections even if they haven't changed */
if (!strcmp(sec->name, ".shstrtab") ||
!strcmp(sec->name, ".strtab") ||
!strcmp(sec->name, ".symtab"))
sec->include = 1;
}
}
int kpatch_include_changed_functions(struct kpatch_elf *kelf)
{
struct symbol *sym;
@ -858,16 +882,9 @@ void kpatch_generate_output(struct kpatch_elf *kelf, struct kpatch_elf **kelfout
struct kpatch_elf *out;
/* count output sections */
for_each_section(i, sec, &kelf->sections) {
/* include these sections even if they haven't changed */
if (!strcmp(sec->name, ".shstrtab") ||
!strcmp(sec->name, ".strtab") ||
!strcmp(sec->name, ".symtab"))
sec->include = 1;
for_each_section(i, sec, &kelf->sections)
if (sec->include)
sections_nr++;
}
log_debug("outputting %d sections\n",sections_nr);
@ -1312,11 +1329,13 @@ int main(int argc, char *argv[])
*/
kpatch_replace_sections_syms(kelf_patched);
kpatch_include_standard_sections(kelf_patched);
if (!kpatch_include_changed_functions(kelf_patched)) {
log_normal("no changed functions were found\n");
return 3; /* 1 is ERROR, 2 is DIFF_FATAL */
}
kpatch_dump_kelf(kelf_patched);
kpatch_verify_patchability(kelf_patched);
/* Generate the output elf */
kpatch_generate_output(kelf_patched, &kelf_out);