Skip to content

kmod/core: fix crash with !CONFIG_DEBUG_SET_MODULE_RONX #544

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
sjenning merged 1 commit into from
Nov 4, 2015
Merged

kmod/core: fix crash with !CONFIG_DEBUG_SET_MODULE_RONX #544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions kmod/core/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ static int kpatch_write_relocations(struct kpatch_module *kpmod,
struct kpatch_dynrela *dynrela;
u64 loc, val;
unsigned long core = (unsigned long)kpmod->mod->module_core;
unsigned long core_ro_size = kpmod->mod->core_ro_size;
unsigned long core_size = kpmod->mod->core_size;
unsigned long src;

Expand Down Expand Up @@ -639,16 +638,17 @@ static int kpatch_write_relocations(struct kpatch_module *kpmod,
return -EINVAL;
}

if (loc >= core && loc < core + core_ro_size)
readonly = 1;
else if (loc >= core + core_ro_size && loc < core + core_size)
readonly = 0;
else {
if (loc < core || loc >= core + core_size) {
pr_err("bad dynrela location 0x%llx for symbol %s\n",
loc, dynrela->name);
return -EINVAL;
}

#ifdef CONFIG_DEBUG_SET_MODULE_RONX
if (loc < core + kpmod->mod->core_ro_size)
readonly = 1;
#endif

numpages = (PAGE_SIZE - (loc & ~PAGE_MASK) >= size) ? 1 : 2;

if (readonly)
Expand Down