From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753175AbbBQWb6 (ORCPT ); Tue, 17 Feb 2015 17:31:58 -0500 Received: from mail.skyhub.de ([78.46.96.112]:43698 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbbBQWb4 (ORCPT ); Tue, 17 Feb 2015 17:31:56 -0500 Date: Tue, 17 Feb 2015 23:31:05 +0100 From: Borislav Petkov To: Kees Cook Cc: Jiri Kosina , "H. Peter Anvin" , LKML , live-patching@vger.kernel.org, Linux-MM , "x86@kernel.org" Subject: Re: [PATCH v2] x86, kaslr: propagate base load address calculation Message-ID: <20150217223105.GI26165@pd.tnic> References: <20150217104443.GC9784@pd.tnic> <20150217123933.GC26165@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 17, 2015 at 08:45:53AM -0800, Kees Cook wrote: > Maybe it should say: > > Kernel offset: disabled > > for maximum clarity? I.e.: --- diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 78c91bbf50e2..16b6043cb073 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -843,10 +843,14 @@ static void __init trim_low_memory_range(void) static int dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) { - pr_emerg("Kernel Offset: 0x%lx from 0x%lx " - "(relocation range: 0x%lx-0x%lx)\n", - (unsigned long)&_text - __START_KERNEL, __START_KERNEL, - __START_KERNEL_map, MODULES_VADDR-1); + if (kaslr_enabled) + pr_emerg("Kernel Offset: 0x%lx from 0x%lx (relocation range: 0x%lx-0x%lx)\n", + (unsigned long)&_text - __START_KERNEL, + __START_KERNEL, + __START_KERNEL_map, + MODULES_VADDR-1); + else + pr_emerg("Kernel Offset: disabled\n"); return 0; } --- ? -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. --