RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-02-17 02:06:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

kmod: core: use new module core_layout struct

Browse Source 
Commit 7523e4dc5057 upstream ("module: use a structure to encapsulate
layout") uses a new field to access module memory. Account for this change
and ensure backwards compatibility with kernel versions < 4.5
This commit is contained in:
Jessica Yu 2016-02-17 13:09:20 -08:00
parent 83beb356ed
commit 85a055665e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kmod/core/core.c
View File

@ -42,6 +42,7 @@
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/version.h>
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include "kpatch.h" #include "kpatch.h"
@ -583,8 +584,13 @@ static int kpatch_write_relocations(struct kpatch_module *kpmod,
int ret, size, readonly = 0, numpages; 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; #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
unsigned long core_size = kpmod->mod->core_size; unsigned long core = (unsigned long)kpmod->mod->core_layout.base;
unsigned long core_size = kpmod->mod->core_layout.size;
#else
unsigned long core = (unsigned long)kpmod->mod->module_core;
unsigned long core_size = kpmod->mod->core_size;
#endif
unsigned long src; unsigned long src;
list_for_each_entry(dynrela, &object->dynrelas, list) { list_for_each_entry(dynrela, &object->dynrelas, list) {
@ -645,7 +651,11 @@ static int kpatch_write_relocations(struct kpatch_module *kpmod,
} }
#ifdef CONFIG_DEBUG_SET_MODULE_RONX #ifdef CONFIG_DEBUG_SET_MODULE_RONX
if (loc < core + kpmod->mod->core_ro_size) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
if (loc < core + kpmod->mod->core_layout.ro_size)
#else
if (loc < core + kpmod->mod->core_ro_size)
#endif
readonly = 1; readonly = 1;
#endif #endif