Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 1 Jul 2019 14:51:30 -0700
From:   Kees Cook <keescook@chromium.org>
To:     Ingo Molnar <mingo@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Borislav Petkov <bp@alien8.de>
Cc:     linux-kernel@vger.kernel.org, Ross Zwisler <zwisler@google.com>,
        Ross Zwisler <zwisler@chromium.org>,
        "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org,
        Johannes Hirte <johannes.hirte@datenkhaos.de>,
        Klaus Kusche <klaus.kusche@computerix.info>,
        samitolvanen@google.com, Guenter Roeck <groeck@google.com>
Subject: Re: [PATCH] Revert "x86/build: Move _etext to actual end of .text"
Message-ID: <201907011450.100092F32@keescook>
References: <20190701155208.211815-1-zwisler@google.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190701155208.211815-1-zwisler@google.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Jul 01, 2019 at 09:52:08AM -0600, Ross Zwisler wrote:
> This reverts commit 392bef709659abea614abfe53cf228e7a59876a4.
> 
> Per the discussion here:
> 
> https://lkml.org/lkml/2019/6/20/830
> 
> the above referenced commit breaks kernel compilation with old GCC
> toolchains as well as current versions of the Gold linker.  Revert it so
> we don't regress and lose the ability to compile the kernel with these
> tools.
> 
> Signed-off-by: Ross Zwisler <zwisler@google.com>

Acked-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  arch/x86/kernel/vmlinux.lds.S | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
> index 0850b5149345..4d1517022a14 100644
> --- a/arch/x86/kernel/vmlinux.lds.S
> +++ b/arch/x86/kernel/vmlinux.lds.S
> @@ -141,10 +141,10 @@ SECTIONS
>  		*(.text.__x86.indirect_thunk)
>  		__indirect_thunk_end = .;
>  #endif
> -	} :text = 0x9090
>  
> -	/* End of text section */
> -	_etext = .;
> +		/* End of text section */
> +		_etext = .;
> +	} :text = 0x9090
>  
>  	NOTES :text :note
>  
> -- 
> 2.20.1

-- 
Kees Cook