Skip to content

create-diff-object: include __ftr_alt_* when regenerating __ftr_fixup #1523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joe-lawrence wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

create-diff-object: include __ftr_alt_* when regenerating __ftr_fixup #1523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion kpatch-build/create-diff-object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2937,7 +2937,7 @@ static void kpatch_regenerate_special_section(struct kpatch_elf *kelf,
rela->offset -= src_offset - dest_offset;
rela->rela.r_offset = rela->offset;

rela->sym->include = 1;
kpatch_include_symbol(rela->sym);

if (!strcmp(special->name, ".fixup"))
kpatch_update_ex_table_addend(kelf, special,
Expand Down Expand Up @@ -3079,6 +3079,20 @@ static void kpatch_regenerate_orc_sections(struct kpatch_elf *kelf)
ip_sec->data->d_size = dest_idx * ORC_IP_PTR_SIZE;
}

static bool is_ftr_alt_fixup_reloc(struct section *relasec, struct rela *rela)
{
if (!relasec->base)
return false;

if (strncmp(relasec->base->name, "__ftr_fixup", 11) &&
strncmp(relasec->base->name, "__mmu_ftr_fixup", 15) &&
strncmp(relasec->base->name, "__fw_ftr_fixup", 14))
return false;

return rela->sym->type == STT_SECTION &&
!strncmp(rela->sym->name, "__ftr_alt_", 10);
}

static void kpatch_check_relocations(struct kpatch_elf *kelf)
{
struct rela *rela;
Expand All @@ -3092,6 +3106,8 @@ static void kpatch_check_relocations(struct kpatch_elf *kelf)
list_for_each_entry(rela, &relasec->relas, list) {
if (!rela->sym->sec)
continue;
if (is_ftr_alt_fixup_reloc(relasec, rela))
continue;

sec_size = rela->sym->sec->data->d_size;
sec_off = (long)rela->sym->sym.st_value +
Expand Down
Loading