Re: [PATCH 2/2] x86/mm/KASLR: Correct the upper boundary of KALSR mm regions if adjacent to EFI

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	Bhupesh Sharma <bhsharma@redhat.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH 2/2] x86/mm/KASLR: Correct the upper boundary of KALSR mm regions if adjacent to EFI
Date	Wed, 08 Mar 2017 09:40:01 +0100
Message-ID	<tiFix-3NE-1@gated-at.bofh.it> (permalink)
References	<tiEw9-3fU-13@gated-at.bofh.it> <tiEw9-3fU-11@gated-at.bofh.it> <tiF8S-3JU-11@gated-at.bofh.it>
X-Original-To	Dave Young <dyoung@redhat.com>
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/vCE6O8NCggCgscS4VoBoYKer13x8nCzrKYb9qkuJDI=; b=QoVNKf/THvxFNWW3JHWb8leZ5U0gKqlf9NJyltOvjHZ8YxYHLZZtZU9P3SY88OLv6/ Ei8n6L3x80xuQE8Y0umHBkBJmILOB9lkt51qpae/yi83An74Hzd4/tA6tifN3xjaPlLk 0AHk+WlJB+X2fdltxbQF32/btrBZlb6hcEc5fZqtO0SMce8iVym3kLR75VWczGm+wi1V CEK6vAF09MxuLBDu+MS15Dn8HHY3f1cDiClgs5Nsr8s9Rz+sIpU8Q22nWzxJ4Dy0D39H ZnTl3A+YPNzLCmq/WDElNEYUoKXUJQYu+E/GWVm5SHDKkGHzZxHiemMWmwKjVVphxZnt 6tGQ==
X-Gm-Message-State	AMke39mbxkTFlpPJ05Cb5x7dDQc/DHmoHwYP4L/LFtW18bcmVpRsOoD29R9dI6LudPwI5d9grfUkk7dgKP9fyCMa
X-Received	by 10.202.236.148 with SMTP id k142mr2490032oih.56.1488962153439; Wed, 08 Mar 2017 00:35:53 -0800 (PST)
MIME-Version	1.0
Content-Type	text/plain; charset=UTF-8
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	52
Organization	linux.* mail to news gateway
X-Original-Cc	Baoquan He <bhe@redhat.com>, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, thgarnie@google.com, Kees Cook <keescook@chromium.org>, Thomas Gleixner <tglx@linutronix.de>, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, akpm@linux-foundation.org
X-Original-Date	Wed, 8 Mar 2017 14:05:53 +0530
X-Original-Message-ID	<CACi5LpNOyiVmy4hTSXAJWT1p=DD65=wijgJMTcOAo9YudiD_pw@mail.gmail.com>
X-Original-References	<1488959258-4731-1-git-send-email-bhe@redhat.com> <1488959258-4731-2-git-send-email-bhe@redhat.com> <20170308081857.GB12600@dhcp-128-65.nay.redhat.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1594940

Show key headers only | View raw

On Wed, Mar 8, 2017 at 1:48 PM, Dave Young <dyoung@redhat.com> wrote:
> On 03/08/17 at 03:47pm, Baoquan He wrote:
>> EFI allocates runtime services regions top-down, starting from EFI_VA_START
>> to EFI_VA_END. So EFI_VA_START is bigger than EFI_VA_END and is the end of
>> EFI region. The upper boundary of memory regions randomized by KASLR should
>> be EFI_VA_END if it's adjacent to EFI region, but not EFI_VA_START.
>>
>> Correct it in this patch.
>>
>> Signed-off-by: Baoquan He <bhe@redhat.com>
>> ---
>>  arch/x86/mm/kaslr.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
>> index 887e571..aed2064 100644
>> --- a/arch/x86/mm/kaslr.c
>> +++ b/arch/x86/mm/kaslr.c
>> @@ -48,7 +48,7 @@ static const unsigned long vaddr_start = __PAGE_OFFSET_BASE;
>>  #if defined(CONFIG_X86_ESPFIX64)
>>  static const unsigned long vaddr_end = ESPFIX_BASE_ADDR;
>>  #elif defined(CONFIG_EFI)
>> -static const unsigned long vaddr_end = EFI_VA_START;
>> +static const unsigned long vaddr_end = EFI_VA_END;
>>  #else
>>  static const unsigned long vaddr_end = __START_KERNEL_map;
>>  #endif
>> @@ -105,7 +105,7 @@ void __init kernel_randomize_memory(void)
>>        */
>>       BUILD_BUG_ON(vaddr_start >= vaddr_end);
>>       BUILD_BUG_ON(IS_ENABLED(CONFIG_X86_ESPFIX64) &&
>> -                  vaddr_end >= EFI_VA_START);
>> +                  vaddr_end >= EFI_VA_END);
>>       BUILD_BUG_ON((IS_ENABLED(CONFIG_X86_ESPFIX64) ||
>>                     IS_ENABLED(CONFIG_EFI)) &&
>>                    vaddr_end >= __START_KERNEL_map);
>> --
>> 2.5.5
>>
>
> Acked-by: Dave Young <dyoung@redhat.com>
>

Thanks Bao for this fix. This makes the KASLR code consistent with
Address space markers hints in [1]

[1] http://lxr.free-electrons.com/source/arch/x86/mm/dump_pagetables.c#L82

Reviewed-by: Bhupesh Sharma <bhsharma@redhat.com>

Regards,
Bhupesh

Thread

[PATCH 2/2] x86/mm/KASLR: Correct the upper boundary of KALSR mm regions if adjacent to EFI Baoquan He <bhe@redhat.com> - 2017-03-08 08:50 +0100
  Re: [PATCH 2/2] x86/mm/KASLR: Correct the upper boundary of KALSR mm  regions if adjacent to EFI Dave Young <dyoung@redhat.com> - 2017-03-08 09:30 +0100
    Re: [PATCH 2/2] x86/mm/KASLR: Correct the upper boundary of KALSR mm  regions if adjacent to EFI Bhupesh Sharma <bhsharma@redhat.com> - 2017-03-08 09:40 +0100
      Re: [PATCH 2/2] x86/mm/KASLR: Correct the upper boundary of KALSR mm  regions if adjacent to EFI Thomas Garnier <thgarnie@google.com> - 2017-03-08 16:50 +0100

csiph-web