Subject: Re: [PATCH 1/2] x86: fix norandmaps
To: Oleg Nesterov <oleg@redhat.com>, Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@suse.de>,
        Cyrill Gorcunov <gorcunov@openvz.org>, linux-kernel@vger.kernel.org
References: <20170710111429.GA20038@redhat.com>
From: Dmitry Safonov <dsafonov@virtuozzo.com>
Message-ID: <2a3a4365-b3e1-5d52-0f4c-d7bdfaff627f@virtuozzo.com>
Date: Mon, 10 Jul 2017 14:56:00 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.2.0
MIME-Version: 1.0
In-Reply-To: <20170710111429.GA20038@redhat.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2017 11:56:20.5501 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1738
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1350
Lines: 46

On 07/10/2017 02:14 PM, Oleg Nesterov wrote:
> Documentation/admin-guide/kernel-parameters.txt says:
> 
>      norandmaps  Don't use address space randomization. Equivalent
>                  to echo 0 > /proc/sys/kernel/randomize_va_space
> 
> but it doesn't work because arch_rnd() which is used to randomize
> mm->mmap_base returns a random value unconditionally.
> 
> Shift the PF_RANDOMIZE check from arch_mmap_rnd() to arch_rnd().
> 
> Fixes: 1b028f784e8c ("x86/mm: Introduce mmap_compat_base() for 32-bit mmap()")
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>

Thanks, Oleg,
Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>

> ---
>   arch/x86/mm/mmap.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
> index 19ad095..6369d04 100644
> --- a/arch/x86/mm/mmap.c
> +++ b/arch/x86/mm/mmap.c
> @@ -82,13 +82,13 @@ static int mmap_is_legacy(void)
>   
>   static unsigned long arch_rnd(unsigned int rndbits)
>   {
> +	if (!(current->flags & PF_RANDOMIZE))
> +		return 0;
>   	return (get_random_long() & ((1UL << rndbits) - 1)) << PAGE_SHIFT;
>   }
>   
>   unsigned long arch_mmap_rnd(void)
>   {
> -	if (!(current->flags & PF_RANDOMIZE))
> -		return 0;
>   	return arch_rnd(mmap_is_ia32() ? mmap32_rnd_bits : mmap64_rnd_bits);
>   }
>   
> 


-- 
              Dmitry