diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-27 13:41:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-27 13:41:11 +0100 |
| commit | 3fb42daaf11c4be8e0626b733916f3a7b65bcfae (patch) | |
| tree | d40ab1904047d2db03c9f6e9b538e01d62415646 /kernel/livepatch/core.c | |
| parent | efdbe3c3edb6c8c98a8be863f60916780a5375c1 (diff) | |
| parent | 06a691e64b11323a735db3c3bd909d3c0712698f (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'kernel/livepatch/core.c')
| -rw-r--r-- | kernel/livepatch/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index 6e5344112419..db545cbcdb89 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -294,6 +294,12 @@ static int klp_write_object_relocations(struct module *pmod, for (reloc = obj->relocs; reloc->name; reloc++) { if (!klp_is_module(obj)) { + +#if defined(CONFIG_RANDOMIZE_BASE) + /* If KASLR has been enabled, adjust old value accordingly */ + if (kaslr_enabled()) + reloc->val += kaslr_offset(); +#endif ret = klp_verify_vmlinux_symbol(reloc->name, reloc->val); if (ret) |