diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-18 13:12:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-18 13:12:55 +1100 |
| commit | ef9903e3826c3258d3f242ea152ebc95fb490f79 (patch) | |
| tree | b9a4f290bdd0e89f006cec36c74213573374c02d | |
| parent | 8da51093daa3899c3848ebc0de682c7b30e690d5 (diff) | |
| parent | 2184037e40ce3807df83a47b43a7f1674ee3027b (diff) | |
| download | linux-ef9903e3826c3258d3f242ea152ebc95fb490f79.tar.gz linux-ef9903e3826c3258d3f242ea152ebc95fb490f79.tar.xz | |
Merge remote-tracking branch 'livepatching/for-next'
| -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) |