mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 21:39:35 -04:00
A klp relocation section is .klp.rela.<objname>.<secname>, where objname
is the object being patched.
klp-build wrongly derives objname from where the referenced symbol
lives, not where it's referenced. For a cross-module reference like
patched can_isotp code calling can.ko's can_rx_unregister(), that gives
.klp.rela.can..text rather than .klp.rela.can_isotp..text. Unless the
patch happens to patch can.ko as well, the relocation never gets applied
and the call goes off into the weeds.
Name the intermediate section __klp_relocs.<objname> so post-link can
read the patched object's name from there.
Fixes: dd590d4d57 ("objtool/klp: Introduce klp diff subcommand for diffing object files")
Reported-by: Joe Lawrence <joe.lawrence@redhat.com>
Link: https://lore.kernel.org/20260720145658.1103243-2-joe.lawrence@redhat.com
Acked-by: Song Liu <song@kernel.org>
Acked-by: Joe Lawrence <joe.lawrence@redhat.com>
Link: https://patch.msgid.link/ee93a08f3e55e76ffa67d04e283917ddaa893f09.1786138493.git.jpoimboe@kernel.org
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
178 lines
4.3 KiB
C
178 lines
4.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Read the intermediate KLP reloc/symbol representations created by klp diff
|
|
* and convert them to the proper format required by livepatch. This needs to
|
|
* run last to avoid linker wreckage. Linkers don't tend to handle the "two
|
|
* rela sections for a single base section" case very well, nor do they like
|
|
* SHN_LIVEPATCH.
|
|
*
|
|
* This is the final tool in the livepatch module generation pipeline:
|
|
*
|
|
* kernel builds -> objtool klp diff -> module link -> objtool klp post-link
|
|
*/
|
|
|
|
#include <fcntl.h>
|
|
#include <gelf.h>
|
|
#include <objtool/objtool.h>
|
|
#include <objtool/warn.h>
|
|
#include <objtool/klp.h>
|
|
#include <objtool/util.h>
|
|
#include <linux/livepatch_external.h>
|
|
|
|
static int fix_klp_reloc_sec(struct elf *elf, struct section *symtab,
|
|
struct section *klp_relocs)
|
|
{
|
|
/* section format: __klp_relocs.sec_objname */
|
|
const char *sec_objname = klp_relocs->name + strlen(KLP_RELOCS_SEC ".");
|
|
|
|
for (int i = 0; i < sec_size(klp_relocs) / sizeof(struct klp_reloc); i++) {
|
|
struct klp_reloc *klp_reloc;
|
|
unsigned long klp_reloc_off;
|
|
struct section *sec, *tmp, *klp_rsec;
|
|
unsigned long offset;
|
|
struct reloc *reloc;
|
|
char rsec_name[SEC_NAME_LEN];
|
|
u64 addend;
|
|
struct symbol *sym, *klp_sym;
|
|
|
|
klp_reloc_off = i * sizeof(*klp_reloc);
|
|
klp_reloc = klp_relocs->data->d_buf + klp_reloc_off;
|
|
|
|
/*
|
|
* Read __klp_relocs[i]:
|
|
*/
|
|
|
|
/* klp_reloc.sec_offset */
|
|
reloc = find_reloc_by_dest(elf, klp_relocs,
|
|
klp_reloc_off + offsetof(struct klp_reloc, offset));
|
|
if (!reloc) {
|
|
ERROR("malformed %s section", klp_relocs->name);
|
|
return -1;
|
|
}
|
|
|
|
sec = reloc->sym->sec;
|
|
offset = reloc_addend(reloc);
|
|
|
|
/* klp_reloc.sym */
|
|
reloc = find_reloc_by_dest(elf, klp_relocs,
|
|
klp_reloc_off + offsetof(struct klp_reloc, sym));
|
|
if (!reloc) {
|
|
ERROR("malformed %s section", klp_relocs->name);
|
|
return -1;
|
|
}
|
|
|
|
klp_sym = reloc->sym;
|
|
addend = reloc_addend(reloc);
|
|
|
|
/*
|
|
* Create the KLP rela:
|
|
*/
|
|
|
|
/* section format: .klp.rela.sec_objname.section_name */
|
|
if (snprintf_check(rsec_name, SEC_NAME_LEN,
|
|
KLP_RELOC_SEC_PREFIX "%s.%s",
|
|
sec_objname, sec->name))
|
|
return -1;
|
|
|
|
klp_rsec = find_section_by_name(elf, rsec_name);
|
|
if (!klp_rsec) {
|
|
klp_rsec = elf_create_section(elf, rsec_name, 0,
|
|
elf_rela_size(elf),
|
|
SHT_RELA, elf_addr_size(elf),
|
|
SHF_ALLOC | SHF_INFO_LINK | SHF_RELA_LIVEPATCH);
|
|
if (!klp_rsec)
|
|
return -1;
|
|
|
|
klp_rsec->sh.sh_link = symtab->idx;
|
|
klp_rsec->sh.sh_info = sec->idx;
|
|
klp_rsec->base = sec;
|
|
}
|
|
|
|
tmp = sec->rsec;
|
|
sec->rsec = klp_rsec;
|
|
if (!elf_create_reloc(elf, sec, offset, klp_sym, addend, klp_reloc->type))
|
|
return -1;
|
|
sec->rsec = tmp;
|
|
|
|
/*
|
|
* Fix up the corresponding KLP symbol:
|
|
*/
|
|
|
|
klp_sym->sym.st_shndx = SHN_LIVEPATCH;
|
|
if (!gelf_update_sym(symtab->data, klp_sym->idx, &klp_sym->sym)) {
|
|
ERROR_ELF("gelf_update_sym");
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
* Disable the original non-KLP reloc by converting it to R_*_NONE:
|
|
*/
|
|
|
|
reloc = find_reloc_by_dest(elf, sec, offset);
|
|
sym = reloc->sym;
|
|
sym->sym.st_shndx = SHN_LIVEPATCH;
|
|
set_reloc_type(elf, reloc, 0);
|
|
if (!gelf_update_sym(symtab->data, sym->idx, &sym->sym)) {
|
|
ERROR_ELF("gelf_update_sym");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int fix_klp_relocs(struct elf *elf)
|
|
{
|
|
struct section *symtab, *sec;
|
|
|
|
symtab = find_section_by_name(elf, ".symtab");
|
|
if (!symtab) {
|
|
ERROR("missing .symtab");
|
|
return -1;
|
|
}
|
|
|
|
for_each_sec(elf, sec) {
|
|
if (strncmp(sec->name, KLP_RELOCS_SEC ".",
|
|
strlen(KLP_RELOCS_SEC ".")))
|
|
continue;
|
|
|
|
if (fix_klp_reloc_sec(elf, symtab, sec))
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* This runs on the livepatch module after all other linking has been done. It
|
|
* converts the intermediate __klp_relocs.* sections into proper KLP relocs to
|
|
* be processed by livepatch. This needs to run last to avoid linker wreckage.
|
|
* Linkers don't tend to handle the "two rela sections for a single base
|
|
* section" case very well, nor do they appreciate SHN_LIVEPATCH.
|
|
*/
|
|
int cmd_klp_post_link(int argc, const char **argv)
|
|
{
|
|
struct elf *elf;
|
|
|
|
argc--;
|
|
argv++;
|
|
|
|
if (argc != 1) {
|
|
fprintf(stderr, "%d\n", argc);
|
|
fprintf(stderr, "usage: objtool link <file.ko>\n");
|
|
return -1;
|
|
}
|
|
|
|
elf = elf_open_read(argv[0], O_RDWR);
|
|
if (!elf)
|
|
return -1;
|
|
|
|
if (fix_klp_relocs(elf))
|
|
return -1;
|
|
|
|
if (elf_write(elf))
|
|
return -1;
|
|
|
|
return elf_close(elf);
|
|
}
|