LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jeffrey Hugo <jhugo@codeaurora.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Mark Rutland <mark.rutland@arm.com>,
	Jan Glauber <jan.glauber@caviumnetworks.com>,
	Kees Cook <keescook@chromium.org>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Laura Abbott <labbott@redhat.com>,
	Timur Tabi <timur@codeaurora.org>,
	Stephen Smalley <sds@tycho.nsa.gov>,
	Andrew Morton <akpm@linux-foundation.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH v2] init: Fix false positives in W+X checking
Date: Mon, 30 Apr 2018 08:10:05 -0600	[thread overview]
Message-ID: <d81d6d59-ce38-7051-8481-980daa4246d6@codeaurora.org> (raw)
In-Reply-To: <20180428061401.oj4tytn6yy277f7y@gmail.com>

On 4/28/2018 12:14 AM, Ingo Molnar wrote:
> 
> * Jeffrey Hugo <jhugo@codeaurora.org> wrote:
> 
>> load_module() creates W+X mappings via __vmalloc_node_range() (from
>> layout_and_allocate()->move_module()->module_alloc()) by using
>> PAGE_KERNEL_EXEC.  These mappings are later cleaned up via
>> "call_rcu_sched(&freeinit->rcu, do_free_init)" from do_init_module().
>>
>> This is a problem because call_rcu_sched() queues work, which can be run
>> after debug_checkwx() is run, resulting in a race condition.  If hit, the
>> race results in a nasty splat about insecure W+X mappings, which results
>> in a poor user experience as these are not the mappings that
>> debug_checkwx() is intended to catch.
>>
>> This issue is observed on multiple arm64 platforms, and has been
>> artificially triggered on an x86 platform.
>>
>> Address the race by flushing the queued work before running the
>> arch-defined mark_rodata_ro() which then calls debug_checkwx().
>>
>> Reported-by: Timur Tabi <timur@codeaurora.org>
>> Reported-by: Jan Glauber <jan.glauber@caviumnetworks.com>
>> Fixes: e1a58320a38d ("x86/mm: Warn on W^X mappings")
>> Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
>> ---
>>
>> v1:
>> -was "arm64: mm: Fix false positives in W+X checking" (see [1])
>> -moved to common code based on review and confirmation of issue on x86
>>
>> [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2018-April/573776.html
>>
>>   init/main.c | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/init/main.c b/init/main.c
>> index b795aa3..499d957 100644
>> --- a/init/main.c
>> +++ b/init/main.c
>> @@ -1034,6 +1034,13 @@ static int __init set_debug_rodata(char *str)
>>   static void mark_readonly(void)
>>   {
>>   	if (rodata_enabled) {
>> +		/*
>> +		 * load_module() results in W+X mappings, which are cleaned up
>> +		 * with call_rcu_sched().  Let's make sure that queued work is
>> +		 * flushed so that we don't hit false positives looking for
>> +		 * insecure pages which are W+X.
>> +		 */
>> +		rcu_barrier_sched();
> 
> I'd suggest adding a matching comment to the module loading portion as well,
> to make sure this connection does not get lost. With that:
> 
> Acked-by: Ingo Molnar <mingo@kernel.org>

Sure.  Will add that in a v3.

-- 
Jeffrey Hugo
Qualcomm Datacenter Technologies as an affiliate of Qualcomm 
Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.

  reply	other threads:[~2018-04-30 14:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-27 21:55 Jeffrey Hugo
2018-04-28  3:05 ` Kees Cook
2018-04-28  6:14 ` Ingo Molnar
2018-04-30 14:10   ` Jeffrey Hugo [this message]
2018-04-30  8:31 ` Will Deacon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d81d6d59-ce38-7051-8481-980daa4246d6@codeaurora.org \
    --to=jhugo@codeaurora.org \
    --cc=akpm@linux-foundation.org \
    --cc=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=jan.glauber@caviumnetworks.com \
    --cc=keescook@chromium.org \
    --cc=labbott@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=sds@tycho.nsa.gov \
    --cc=tglx@linutronix.de \
    --cc=timur@codeaurora.org \
    --cc=will.deacon@arm.com \
    --subject='Re: [PATCH v2] init: Fix false positives in W+X checking' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).