tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching

Pull livepatching fix from Jiri Kosina:
"A fix for module handling in case kASLR has been enabled, from Zhou
Chengming"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
livepatch: x86: fix relocation computation with kASLR

Linus Torvalds a3d66b5a 319645ca

+6
+6
kernel/livepatch/core.c
··· 294 294 295 295 for (reloc = obj->relocs; reloc->name; reloc++) { 296 296 if (!klp_is_module(obj)) { 297 + 298 + #if defined(CONFIG_RANDOMIZE_BASE) 299 + /* If KASLR has been enabled, adjust old value accordingly */ 300 + if (kaslr_enabled()) 301 + reloc->val += kaslr_offset(); 302 + #endif 297 303 ret = klp_verify_vmlinux_symbol(reloc->name, 298 304 reloc->val); 299 305 if (ret)