Skip to content

create-diff-object/ppc64le: Fix replace_sections_syms() for bundled s… #1007

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

Merged
jpoimboe merged 2 commits into from
Jul 24, 2019
Merged

create-diff-object/ppc64le: Fix replace_sections_syms() for bundled s… #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8f7f2d
create-diff-object/ppc64le: Fix replace_sections_syms() for bundled s…
jpoimboe Jul 23, 2019
cef3360
test/unit: Add unit test for ppc64le bundle replace_sections_syms()
jpoimboe Jul 23, 2019
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
9 changes: 9 additions & 0 deletions kpatch-build/create-diff-object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,6 +1282,15 @@ static void kpatch_replace_sections_syms(struct kpatch_elf *kelf)
if (rela->sym->sec && rela->sym->sec->sym) {
rela->sym = rela->sym->sec->sym;

/*
* On ppc64le with GCC6+, the function symbol
* starts 8 bytes past the beginning of the
* section, because of localentry. So even
* though the symbol is bundled, we can't
* assume it's at offset 0 in the section.
*/
rela->addend -= rela->sym->sym.st_value;

continue;
}

Expand Down
2 changes: 1 addition & 1 deletion test/unit/objs
Open in desktop
Submodule objs updated 3 files
+ − ppc64le/ppc64le-bundled-localentry-issue-1007.ORIG.o
+ − ppc64le/ppc64le-bundled-localentry-issue-1007.PATCHED.o
+6 −0 ppc64le/ppc64le-bundled-localentry-issue-1007.test