RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

section reference replacement for references inside symbols 

Currently unbundled section references are only replaced if the start of
the symbol is referenced.  It's also useful to support replacement of
references which point to inside the symbol.
This commit is contained in:
Josh Poimboeuf 2014-10-06 22:17:24 -05:00
parent bb35e37c47
commit 3dd442b12d
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1118,21 +1118,26 @@ void kpatch_replace_sections_syms(struct kpatch_elf *kelf)
* with their symbols.
*/
list_for_each_entry(sym, &kelf->symbols, list) {
int start, end;
if (sym->type == STT_SECTION ||
sym->sec != rela->sym->sec)
continue;
if (sym->sym.st_value != rela->addend + add_off)
start = sym->sym.st_value;
end = sym->sym.st_value + sym->sym.st_size;
if (rela->addend + add_off < start ||
rela->addend + add_off >= end)
continue;
log_debug("%s: replacing %s+%d reference with %s+%d\n",
sec->name,
rela->sym->name, rela->addend,
sym->name, rela->addend - add_off);
sym->name, rela->addend - start);
rela->sym = sym;
rela->addend = -add_off;
rela->addend -= start;
break;
}
}

29
test/integration/replace-section-references.patch Normal file
View File

@ -0,0 +1,29 @@
Index: src/arch/x86/kvm/x86.c
===================================================================
--- src.orig/arch/x86/kvm/x86.c
+++ src/arch/x86/kvm/x86.c
@@ -211,6 +211,8 @@ static void shared_msr_update(unsigned s
void kvm_define_shared_msr(unsigned slot, u32 msr)
{
+ if (!jiffies)
+ printk("kpatch kvm define shared msr\n");
if (slot >= shared_msrs_global.nr)
shared_msrs_global.nr = slot + 1;
shared_msrs_global.msrs[slot] = msr;
@@ -6307,6 +6309,7 @@ static int complete_emulated_mmio(struct
}
+#include "kpatch-macros.h"
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
{
int r;
@@ -6352,6 +6355,7 @@ out:
return r;
}
+KPATCH_IGNORE_FUNCTION(kvm_arch_vcpu_ioctl_run);
int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
{