RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-01-14 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #271 from jpoimboe/relocation-page-boundary

Browse Source 
kmod/core: fix relocation writes across page boundaries
This commit is contained in:
Seth Jennings 2014-06-26 16:51:20 -05:00
commit 41c6b48920
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kmod/core/core.c
View File

@ -509,7 +509,7 @@ static unsigned long kpatch_find_module_symbol(struct module *mod,
static int kpatch_write_relocations(struct kpatch_module *kpmod, static int kpatch_write_relocations(struct kpatch_module *kpmod,
struct kpatch_object *object) struct kpatch_object *object)
{ {
int ret, size, readonly = 0; int ret, size, readonly = 0, numpages;
struct kpatch_dynrela *dynrela; struct kpatch_dynrela *dynrela;
u64 loc, val; u64 loc, val;
unsigned long core = (unsigned long)kpmod->mod->module_core; unsigned long core = (unsigned long)kpmod->mod->module_core;
@ -577,13 +577,15 @@ static int kpatch_write_relocations(struct kpatch_module *kpmod,
return -EINVAL; return -EINVAL;
} }
numpages = (PAGE_SIZE - (loc & ~PAGE_MASK) >= size) ? 1 : 2;
if (readonly) if (readonly)
set_memory_rw(loc & PAGE_MASK, 1); 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, 1); 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",