linux-kernel - Re: linux-next: manual merge of the akpm tree with the arm64-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210526090234.GB19992@arm.com>
Date:   Wed, 26 May 2021 10:02:34 +0100
From:   Catalin Marinas <catalin.marinas@....com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Will Deacon <will@...nel.org>,
        Jisheng Zhang <Jisheng.Zhang@...aptics.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mike Rapoport <rppt@...nel.org>,
        Mike Rapoport <rppt@...ux.ibm.com>
Subject: Re: linux-next: manual merge of the akpm tree with the arm64-fixes
 tree

On Wed, May 26, 2021 at 04:49:10PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/mm/mmu.c
> index cbcbd64818eb,e3b639e2461d..000000000000
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@@ -515,8 -516,7 +516,7 @@@ static void __init map_mem(pgd_t *pgdp
>   	 */
>   	BUILD_BUG_ON(pgd_index(direct_map_end - 1) == pgd_index(direct_map_end));
>   
> - 	if (rodata_full || crash_mem_map || debug_pagealloc_enabled() ||
> - 	    IS_ENABLED(CONFIG_KFENCE))
>  -	if (can_set_direct_map() || crash_mem_map)
> ++	if (can_set_direct_map() || crash_mem_map || IS_ENABLED(CONFIG_KFENCE))
>   		flags |= NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;

It looks fine. Thanks Stephen.



-- 
Catalin