From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCE7FC10F0B for ; Thu, 18 Apr 2019 05:28:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F64A21479 for ; Thu, 18 Apr 2019 05:28:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="WZmIDWwI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387946AbfDRF2w (ORCPT ); Thu, 18 Apr 2019 01:28:52 -0400 Received: from mail-vs1-f68.google.com ([209.85.217.68]:41142 "EHLO mail-vs1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725888AbfDRF2v (ORCPT ); Thu, 18 Apr 2019 01:28:51 -0400 Received: by mail-vs1-f68.google.com with SMTP id g187so501879vsc.8 for ; Wed, 17 Apr 2019 22:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YsXAYO0c8zFLQiUk70GsGhFvh+QJiSpbjT3b+4rW66I=; b=WZmIDWwIQt+p2U8OFcegWRRVLp6nJI1rwc15/sOJzGCUmcSGRFPVv48qDCitMPl6bn rM78n9VYubygolMm6Ghe0eVh8aEQd+wbbsAcLH0uKTj/Hr9dtxdm7CrqSOZUwvjdwtFp 4/y4Gx8iiVq8g1yfl8tKAiGgIRUjAi38RRMeM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YsXAYO0c8zFLQiUk70GsGhFvh+QJiSpbjT3b+4rW66I=; b=oZvtid9Na7tqMyy3bpAkG/IiSn6OOFsjUl6Atos8hPTR/2VImERmwuTdXWanMOvi8R 905CoRzgeLgnLZCM7kmBGlzKWXXpO8I8g/mLp4darkaRdqgux/lQASugP+pzBmsukEUl qT6ZXZpCLujgjjNefNF5dR+vNW2jwmn3rcw6kZ+xvYLNcZMqDSypCO8S63w6I8ECE41L rz+DprMeLbJfygcmvjDeotVoFMZx1nFYvaQZho2BQSYESUZxrhW0iHv8qsY1TG8zkAdr PL2gVVfqtXadZbmdjEXZU2Vuu1BdhusCg95ufA668o8wOg8RRYp2VYriyd7QCCGsj7h1 MIMA== X-Gm-Message-State: APjAAAVTphR6zt+xKhNKXF+Lzw92BHTqC9QqVcoUr2Ki3hRJU/m8wMHj PGDa/zvZ31CDm40UIj7RCDAQ/C1m16o= X-Google-Smtp-Source: APXvYqxqB0U0eysEYIDZTCHSMepk2aPZp5efkHlB4us2Pet+N/nVkmyDNl8gv0tq5dUAtoZCbyRFLQ== X-Received: by 2002:a67:bc01:: with SMTP id t1mr51203336vsn.149.1555565329840; Wed, 17 Apr 2019 22:28:49 -0700 (PDT) Received: from mail-vk1-f180.google.com (mail-vk1-f180.google.com. [209.85.221.180]) by smtp.gmail.com with ESMTPSA id 8sm297882vkw.38.2019.04.17.22.28.46 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 22:28:47 -0700 (PDT) Received: by mail-vk1-f180.google.com with SMTP id w140so215445vkd.3 for ; Wed, 17 Apr 2019 22:28:46 -0700 (PDT) X-Received: by 2002:a1f:7245:: with SMTP id n66mr38243289vkc.40.1555565326448; Wed, 17 Apr 2019 22:28:46 -0700 (PDT) MIME-Version: 1.0 References: <20190417052247.17809-1-alex@ghiti.fr> <20190417052247.17809-8-alex@ghiti.fr> In-Reply-To: <20190417052247.17809-8-alex@ghiti.fr> From: Kees Cook Date: Thu, 18 Apr 2019 00:28:34 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 07/11] arm: Use generic mmap top-down layout To: Alexandre Ghiti Cc: Andrew Morton , Christoph Hellwig , Russell King , Catalin Marinas , Will Deacon , Ralf Baechle , Paul Burton , James Hogan , Palmer Dabbelt , Albert Ou , Alexander Viro , Luis Chamberlain , Kees Cook , LKML , linux-arm-kernel , linux-mips@vger.kernel.org, linux-riscv@lists.infradead.org, "linux-fsdevel@vger.kernel.org" , Linux-MM Content-Type: text/plain; charset="UTF-8" Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Wed, Apr 17, 2019 at 12:30 AM Alexandre Ghiti wrote: > > arm uses a top-down mmap layout by default that exactly fits the generic > functions, so get rid of arch specific code and use the generic version > by selecting ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT. > > Signed-off-by: Alexandre Ghiti Acked-by: Kees Cook -Kees > --- > arch/arm/Kconfig | 1 + > arch/arm/include/asm/processor.h | 2 -- > arch/arm/mm/mmap.c | 62 -------------------------------- > 3 files changed, 1 insertion(+), 64 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 850b4805e2d1..f8f603da181f 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -28,6 +28,7 @@ config ARM > select ARCH_SUPPORTS_ATOMIC_RMW > select ARCH_USE_BUILTIN_BSWAP > select ARCH_USE_CMPXCHG_LOCKREF > + select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU > select ARCH_WANT_IPC_PARSE_VERSION > select BUILDTIME_EXTABLE_SORT if MMU > select CLONE_BACKWARDS > diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h > index 57fe73ea0f72..944ef1fb1237 100644 > --- a/arch/arm/include/asm/processor.h > +++ b/arch/arm/include/asm/processor.h > @@ -143,8 +143,6 @@ static inline void prefetchw(const void *ptr) > #endif > #endif > > -#define HAVE_ARCH_PICK_MMAP_LAYOUT > - > #endif > > #endif /* __ASM_ARM_PROCESSOR_H */ > diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c > index 0b94b674aa91..b8d912ac9e61 100644 > --- a/arch/arm/mm/mmap.c > +++ b/arch/arm/mm/mmap.c > @@ -17,43 +17,6 @@ > ((((addr)+SHMLBA-1)&~(SHMLBA-1)) + \ > (((pgoff)< > -/* gap between mmap and stack */ > -#define MIN_GAP (128*1024*1024UL) > -#define MAX_GAP ((STACK_TOP)/6*5) > -#define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12)) > - > -static int mmap_is_legacy(struct rlimit *rlim_stack) > -{ > - if (current->personality & ADDR_COMPAT_LAYOUT) > - return 1; > - > - if (rlim_stack->rlim_cur == RLIM_INFINITY) > - return 1; > - > - return sysctl_legacy_va_layout; > -} > - > -static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack) > -{ > - unsigned long gap = rlim_stack->rlim_cur; > - unsigned long pad = stack_guard_gap; > - > - /* Account for stack randomization if necessary */ > - if (current->flags & PF_RANDOMIZE) > - pad += (STACK_RND_MASK << PAGE_SHIFT); > - > - /* Values close to RLIM_INFINITY can overflow. */ > - if (gap + pad > gap) > - gap += pad; > - > - if (gap < MIN_GAP) > - gap = MIN_GAP; > - else if (gap > MAX_GAP) > - gap = MAX_GAP; > - > - return PAGE_ALIGN(STACK_TOP - gap - rnd); > -} > - > /* > * We need to ensure that shared mappings are correctly aligned to > * avoid aliasing issues with VIPT caches. We need to ensure that > @@ -181,31 +144,6 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, > return addr; > } > > -unsigned long arch_mmap_rnd(void) > -{ > - unsigned long rnd; > - > - rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1); > - > - return rnd << PAGE_SHIFT; > -} > - > -void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack) > -{ > - unsigned long random_factor = 0UL; > - > - if (current->flags & PF_RANDOMIZE) > - random_factor = arch_mmap_rnd(); > - > - if (mmap_is_legacy(rlim_stack)) { > - mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; > - mm->get_unmapped_area = arch_get_unmapped_area; > - } else { > - mm->mmap_base = mmap_base(random_factor, rlim_stack); > - mm->get_unmapped_area = arch_get_unmapped_area_topdown; > - } > -} > - > /* > * You really shouldn't be using read() or write() on /dev/mem. This > * might go away in the future. > -- > 2.20.1 > -- Kees Cook