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

kmod/core: call unexported set_memory_[ro|rw] 

In recent kernels, set_memory_ro() and set_memory_rw() are no longer
exported.  Call them anyway :-)

Fixes #496.
This commit is contained in:
Josh Poimboeuf 2015-10-26 08:19:25 -05:00
parent ff40e54435
commit b2de4ba059
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kmod/core/core.c
View File

@ -129,6 +129,9 @@ enum {
}; };
static atomic_t kpatch_state; static atomic_t kpatch_state;
static int (*kpatch_set_memory_rw)(unsigned long addr, int numpages);
static int (*kpatch_set_memory_ro)(unsigned long addr, int numpages);
static inline void kpatch_state_idle(void) static inline void kpatch_state_idle(void)
{ {
int state = atomic_read(&kpatch_state); int state = atomic_read(&kpatch_state);
@ -649,12 +652,12 @@ static int kpatch_write_relocations(struct kpatch_module *kpmod,
numpages = (PAGE_SIZE - (loc & ~PAGE_MASK) >= size) ? 1 : 2; numpages = (PAGE_SIZE - (loc & ~PAGE_MASK) >= size) ? 1 : 2;
if (readonly) if (readonly)
set_memory_rw(loc & PAGE_MASK, numpages); kpatch_set_memory_rw(loc & PAGE_MASK, numpages);
ret = probe_kernel_write((void *)loc, &val, size); ret = probe_kernel_write((void *)loc, &val, size);
if (readonly) if (readonly)
set_memory_ro(loc & PAGE_MASK, numpages); kpatch_set_memory_ro(loc & PAGE_MASK, numpages);
if (ret) { if (ret) {
pr_err("write to 0x%llx failed for symbol %s\n", pr_err("write to 0x%llx failed for symbol %s\n",
@ -1058,6 +1061,18 @@ static int kpatch_init(void)
{ {
int ret; int ret;
kpatch_set_memory_rw = (void *)kallsyms_lookup_name("set_memory_rw");
if (!kpatch_set_memory_rw) {
pr_err("can't find set_memory_rw symbol\n");
return -ENXIO;
}
kpatch_set_memory_ro = (void *)kallsyms_lookup_name("set_memory_ro");
if (!kpatch_set_memory_ro) {
pr_err("can't find set_memory_ro symbol\n");
return -ENXIO;
}
kpatch_root_kobj = kobject_create_and_add("kpatch", kernel_kobj); kpatch_root_kobj = kobject_create_and_add("kpatch", kernel_kobj);
if (!kpatch_root_kobj) if (!kpatch_root_kobj)
return -ENOMEM; return -ENOMEM;