From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755405AbbJAJM3 (ORCPT <rfc822;w@1wt.eu>);
	Thu, 1 Oct 2015 05:12:29 -0400
Received: from mail-wi0-f171.google.com ([209.85.212.171]:36769 "EHLO
	mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751590AbbJAJM0 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 1 Oct 2015 05:12:26 -0400
Date: Thu, 1 Oct 2015 11:12:21 +0200
From: Ingo Molnar <mingo@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Kees Cook <keescook@chromium.org>, Stephen Smalley <sds@tycho.nsa.gov>,
        "x86@kernel.org" <x86@kernel.org>, lkml <linux-kernel@vger.kernel.org>
Subject: Re: rwx mapping between ex_table and rodata
Message-ID: <20151001091221.GB6543@gmail.com>
References: <56045BC4.7000604@tycho.nsa.gov>
 <56045C8A.50102@tycho.nsa.gov>
 <CAGXu5j+tTR=x9RTOFvqQP7+W7DFR6N+GUP__uvAicrfTBU1B7w@mail.gmail.com>
 <56094A89.1010703@tycho.nsa.gov>
 <CAGXu5jLpjs6WD2vQBmkXunVyDmbJ-b1HavdvpNRrPUMAN5xSTg@mail.gmail.com>
 <alpine.DEB.2.11.1510011048010.4500@nanos>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.11.1510011048010.4500@nanos>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* Thomas Gleixner <tglx@linutronix.de> wrote:

> On Mon, 28 Sep 2015, Kees Cook wrote:
> > > --- a/arch/x86/mm/init_64.c
> > > +++ b/arch/x86/mm/init_64.c
> > > @@ -1132,7 +1132,7 @@ void mark_rodata_ro(void)
> > >          * has been zapped already via cleanup_highmem().
> > >          */
> > >         all_end = roundup((unsigned long)_brk_end, PMD_SIZE);
> > > -       set_memory_nx(rodata_start, (all_end - rodata_start) >> PAGE_SHIFT);
> > > +       set_memory_nx(text_end, (all_end - text_end) >> PAGE_SHIFT);
> > >
> > >         rodata_test();
> > >
> > >
> > 
> > That should work, yeah. I'd still like to find the default permissions and 
> > make them W+nx, though. Regardless, let's get the above added.
> 
> The default permissions are set at boot time when setting up the early page 
> tables. When we split them up later on we inherit the PTE bits and then we do 
> that _ro/nx cleanup after the overall layout has been settled.
> 
> We can't make them W+nx in the early setup without shooting ourself in the foot, 
> because we only set up at the pud/pmd level.

So I think at minimum we should do a (debug) scan in late init, of the whole 
range, for any leftover WX permissions? That would have caught this bug. (and 
might catch other existing bugs that might occur with various configs/hw-layouts.)

Thanks,

	Ingo