Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934474AbbDXT7H (ORCPT ); Fri, 24 Apr 2015 15:59:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47092 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933502AbbDXT7F (ORCPT ); Fri, 24 Apr 2015 15:59:05 -0400 Date: Fri, 24 Apr 2015 21:59:03 +0200 (CEST) From: Jiri Kosina To: Josh Poimboeuf , Seth Jennings , Vojtech Pavlik cc: live-patching@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] livepatch: x86: make kASLR logic more accurate In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2896 Lines: 84 We give up old_addr hint from the coming patch module in cases when kernel load base has been randomized (as in such case, the coming module has no idea about the exact randomization offset). We are currently too pessimistic, and give up immediately as soon as CONFIG_RANDOMIZE_BASE is set; this doesn't however directly imply that the load base has actually been randomized. There are config options that disable kASLR (such as hibernation), user could have disabled kaslr on kernel command-line, etc. The loader propagates the information whether kernel has been randomized through bootparams. This allows us to have the condition more accurate. On top of that, it seems unnecessary to give up old_addr hints even if randomization is active. The relocation offset can be computed as difference between _text start and __START_KERNEL, and therefore old_addr can be adjusted accordingly. Signed-off-by: Jiri Kosina --- v1 -> v2: I accidentally used kgr_ suffix (which we use in kGraft) instead of klp_ in v1. arch/x86/include/asm/livepatch.h | 4 ++++ arch/x86/kernel/livepatch.c | 5 +++++ kernel/livepatch/core.c | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h index 2d29197..84a3247 100644 --- a/arch/x86/include/asm/livepatch.h +++ b/arch/x86/include/asm/livepatch.h @@ -23,8 +23,12 @@ #include #include +#include #ifdef CONFIG_LIVEPATCH + +extern unsigned long klp_vmlinux_relocation_offset(void); + static inline int klp_check_compiler_support(void) { #ifndef CC_USING_FENTRY diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c index ff3c3101d..6df7902 100644 --- a/arch/x86/kernel/livepatch.c +++ b/arch/x86/kernel/livepatch.c @@ -88,3 +88,8 @@ int klp_write_module_reloc(struct module *mod, unsigned long type, return ret; } + +unsigned long klp_vmlinux_relocation_offset(void) +{ + return (unsigned long)&_text - __START_KERNEL; +} diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index 284e269..ff4c35c 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -234,8 +234,9 @@ static int klp_find_verify_func_addr(struct klp_object *obj, int ret; #if defined(CONFIG_RANDOMIZE_BASE) - /* KASLR is enabled, disregard old_addr from user */ - func->old_addr = 0; + /* If KASLR has been enabled, adjust old_addr accordingly */ + if (kaslr_enabled()) + func->old_addr += klp_vmlinux_relocation_offset(); #endif if (!func->old_addr || klp_is_module(obj)) -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/