2015-06-22 20:20:45

by Jiri Kosina

[permalink] [raw]
Subject: [GIT PULL] livepatching for 4.2

Linus,

please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git for-linus

to receive 4.2 merge window updates for livepatching subsystem.

==============================
- symbol lookup locking fix, from Miroslav Benes

- error handling improvements in case of failure of the module coming
notifier, from Minfei Huang

- we were too pessimistic when kASLR has been enabled on x86 and were
dropping address hints on the floor unnecessarily in such case. Fix
from Jiri Kosina

- a few other small fixes and cleanups
==============================

Thanks!

----------------------------------------------------------------

Jiri Kosina (3):
x86: introduce kaslr_offset()
livepatch: x86: make kASLR logic more accurate
x86: kaslr: fix build due to missing ALIGN definition

Jiri Slaby (1):
livepatch: introduce patch/func-walking helpers

Minfei Huang (2):
livepatch: Prevent patch inconsistencies if the coming module notifier fails
livepatch: annotate klp_init() with __init

Miroslav Benes (2):
livepatch: make kobject in klp_object statically allocated
livepatch: add module locking around kallsyms calls

Nicholas Mc Guire (1):
livepatch: match return value to function signature

arch/x86/include/asm/livepatch.h | 1 +
arch/x86/include/asm/setup.h | 7 +++
arch/x86/kernel/machine_kexec_64.c | 3 +-
arch/x86/kernel/setup.c | 2 +-
include/linux/livepatch.h | 8 +++-
kernel/livepatch/core.c | 96 ++++++++++++++++++++++++--------------
6 files changed, 79 insertions(+), 38 deletions(-)

--
Jiri Kosina
SUSE Labs