Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753394AbcDAIoR (ORCPT ); Fri, 1 Apr 2016 04:44:17 -0400 Received: from eddie.linux-mips.org ([148.251.95.138]:46204 "EHLO cvs.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752107AbcDAIoP (ORCPT ); Fri, 1 Apr 2016 04:44:15 -0400 Date: Fri, 1 Apr 2016 10:44:04 +0200 From: Ralf Baechle To: Sergei Shtylyov Cc: Matt Redfearn , linux-mips@linux-mips.org, kernel-hardening@lists.openwall.com, Aaro Koskinen , Masahiro Yamada , Alexander Sverdlin , linux-kernel@vger.kernel.org, Jaedon Shin , Jonas Gorski , Paul Burton Subject: Re: [PATCH v2 11/11] MIPS: KASLR: Print relocation Information on boot Message-ID: <20160401084403.GA28123@linux-mips.org> References: <1459415142-3412-1-git-send-email-matt.redfearn@imgtec.com> <1459415142-3412-12-git-send-email-matt.redfearn@imgtec.com> <56FD1A32.10204@cogentembedded.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <56FD1A32.10204@cogentembedded.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1518 Lines: 44 On Thu, Mar 31, 2016 at 03:38:10PM +0300, Sergei Shtylyov wrote: > >When debugging a relocated kernel, the addresses of the relocated > >symbols and the offset applied is essential information. If the kernel > >is compiled with debugging information, then print this information > >during bootup using the same function as the panic notifer. > > Notifier. Fixed when merging. > >Signed-off-by: Matt Redfearn > >--- > > > >Changes in v2: None > > > > arch/mips/kernel/setup.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > >diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c > >index d8376d7b3345..ae71f8d9b555 100644 > >--- a/arch/mips/kernel/setup.c > >+++ b/arch/mips/kernel/setup.c > >@@ -477,9 +477,18 @@ static void __init bootmem_init(void) > > */ > > if (__pa_symbol(_text) > __pa_symbol(VMLINUX_LOAD_ADDRESS)) { > > unsigned long offset; > >+ extern void show_kernel_relocation(const char *level); > > > > offset = __pa_symbol(_text) - __pa_symbol(VMLINUX_LOAD_ADDRESS); > > free_bootmem(__pa_symbol(VMLINUX_LOAD_ADDRESS), offset); > >+ > >+#if (defined CONFIG_DEBUG_KERNEL) && (defined CONFIG_DEBUG_INFO) > > Not #if defined(CONFIG_DEBUG_KERNEL) && defined(CONFIG_DEBUG_INFO)? > > [...] CPP syntax is not what most people seem to believe that is the parenthesis around the argument of defined are not required so above line is unusual but perfectly ok. However following boring standards is good so I changed this, too. Ralf