From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kees Cook Subject: Re: [PATCH v2 5/9] x86: Make sure _etext includes function sections Date: Thu, 21 May 2020 11:11:18 -0700 Message-ID: <202005211109.4EE4DCBA3@keescook> References: <20200521165641.15940-1-kristen@linux.intel.com> <20200521165641.15940-6-kristen@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727883AbgEUSLW (ORCPT ); Thu, 21 May 2020 14:11:22 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D93D5C061A0F for ; Thu, 21 May 2020 11:11:21 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id m7so3156902plt.5 for ; Thu, 21 May 2020 11:11:21 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20200521165641.15940-6-kristen@linux.intel.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Kristen Carlson Accardi Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, "H. Peter Anvin" , Arnd Bergmann , arjan@linux.intel.com, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com, rick.p.edgecombe@intel.com, Tony Luck , linux-arch@vger.kernel.org On Thu, May 21, 2020 at 09:56:36AM -0700, Kristen Carlson Accardi wrote: > When using -ffunction-sections to place each function in > it's own text section so it can be randomized at load time, the > linker considers these .text.* sections "orphaned sections", and > will place them after the first similar section (.text). In order > to accurately represent the end of the text section and the > orphaned sections, _etext must be moved so that it is after both > .text and .text.* The text size must also be calculated to > include .text AND .text.* > > Signed-off-by: Kristen Carlson Accardi > Reviewed-by: Tony Luck > Tested-by: Tony Luck > --- > arch/x86/kernel/vmlinux.lds.S | 18 +++++++++++++++++- > include/asm-generic/vmlinux.lds.h | 2 +- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S > index 1bf7e312361f..044f7528a2f0 100644 > --- a/arch/x86/kernel/vmlinux.lds.S > +++ b/arch/x86/kernel/vmlinux.lds.S > @@ -147,8 +147,24 @@ SECTIONS > #endif > } :text =0xcccc > > - /* End of text section, which should occupy whole number of pages */ > +#ifdef CONFIG_FG_KASLR > + /* > + * -ffunction-sections creates .text.* sections, which are considered > + * "orphan sections" and added after the first similar section (.text). > + * Adding this ALIGN statement causes the address of _etext > + * to be below that of all the .text.* orphaned sections > + */ > + . = ALIGN(PAGE_SIZE); > +#endif > _etext = .; > + > + /* > + * the size of the .text section is used to calculate the address > + * range for orc lookups. If we just use SIZEOF(.text), we will > + * miss all the .text.* sections. Calculate the size using _etext > + * and _stext and save the value for later. > + */ > + text_size = _etext - _stext; > . = ALIGN(PAGE_SIZE); I don't think there's any need for this #ifdef (nor the trailing ALIGN). I think leave the comment to explain why the ALIGN is being moved before the _etext. A repeated ALIGN won't move the position: --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -147,9 +147,11 @@ SECTIONS #endif } :text =0xcccc + . = ALIGN(PAGE_SIZE); /* End of text section, which should occupy whole number of * pages */ _etext = .; . = ALIGN(PAGE_SIZE); + _ktext = .; X86_ALIGN_RODATA_BEGIN RO_DATA(PAGE_SIZE) $ nm vmlinux | grep '_[ek]text' ffffffff81e02000 R _etext ffffffff81e02000 R _ktext -- Kees Cook