diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-05 18:06:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-05 18:06:29 +0000 |
| commit | ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1 (patch) | |
| tree | 3ae1d5d33402f3459a65fe492c97d75c168bb04c /kernel/livepatch/core.c | |
| parent | 55fc205600ff3b529631cfe03b58645e3844bd92 (diff) | |
| parent | d8018361b58bb7b9a2a657104e54c33c2ef1439d (diff) | |
| download | linux-ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1.tar.gz linux-ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1.zip | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
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) |