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.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 1047FC10F14 for ; Thu, 18 Apr 2019 06:08:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C1DF12184B for ; Thu, 18 Apr 2019 06:08:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1DF12184B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7612E6B0006; Thu, 18 Apr 2019 02:08:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6EAC26B0007; Thu, 18 Apr 2019 02:08:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 564966B0008; Thu, 18 Apr 2019 02:08:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by kanga.kvack.org (Postfix) with ESMTP id 08D246B0006 for ; Thu, 18 Apr 2019 02:08:37 -0400 (EDT) Received: by mail-ed1-f72.google.com with SMTP id p26so657522edy.19 for ; Wed, 17 Apr 2019 23:08:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:to:cc :references:from:message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=skSR5bmb9HcY1GMY6/sKX5kSLKz9gMRClhEZrep8Yy8=; b=XHR06WjKKgs0GQKk22nWGwIOLpyf/pc/Z7BkihO+eyAcBXLeuQqjsBrB00iN4hMz2I qQ+ILI2N/KX9WLlZhSItfz6JF+gybd5ffKFg33uhIMrz/T5O+ITByzxNNpfN60wGJ17F qBy5dfhSsePeTz9UZnYRfUwQa1xnyyM1g3n1E2rDlisnJBwPuDNMLA2isUHchNqkuHXh uD5q0C2PjY4O7Zt3zqvUjL9gPTsamNoqkVdHij5HZrdf2zxMcVut5kv3dnyPQW1oTS0A mrERgG6nz+Rf549t5zASHX6jWZbXKiaroW0FrCXBAX/W3aq9WSvD5t6utfkuMryyfwu7 nfNg== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 217.70.183.200 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr X-Gm-Message-State: APjAAAVfetIz9PY/gVhdYDG1T5qy0zD914cd1y5m8VFCDp4np1mFIgI/ vjFVWud6YqY74wPPhb7Us0x7NX7Mxb1x8IuhBjtAO4OC7Q7cTBCg869W8gGQ+l/HSRkfaJB6Nx0 FnvOZOYG7vrMIm+T+UVpIUnu6WA4VF6zBRxNrVlgaZZpSVzERctyL3cebudwso4s= X-Received: by 2002:a17:906:ddb:: with SMTP id p27mr51127793eji.183.1555567716570; Wed, 17 Apr 2019 23:08:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfl2Jxp3oDwa/l09G6lHvwDqmifj/GRC6e4TJtELifXZnLc+0ZT5S9apTpV1i/Lg7XqVfG X-Received: by 2002:a17:906:ddb:: with SMTP id p27mr51127753eji.183.1555567715641; Wed, 17 Apr 2019 23:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555567715; cv=none; d=google.com; s=arc-20160816; b=ZZoKWArn4cPmFjN417aUcXzvLaDjgRgOrQkiRhB+xNBaCddlzEw7c5h+HbmLVLndWu vTQ6r2TSEaiD4Z9zqv75jdi7EaCFxU+FM1R5Nk+svo9RruIw3lLsl8VObA4YKtKOnU/z RDXc6qwU7vqp9z11/RBxBuWxHHkBEYPzSYqxt79wq5H0srwAow4V4/Maj4VU4fUlJTA4 Ocx2KF5uT6ZXfyPcmkYWXohwLhytdqfl8BjbPt9LCXwa9a9LTxnj3iNI1AT6nYWEQObt jG64uOMX+OsxRziqwJm0nw74E4xGZf7CFtgGqJZKY0pm8H4WupFEcbl0bBjrPN0bWfrZ /EoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-language:content-transfer-encoding:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=skSR5bmb9HcY1GMY6/sKX5kSLKz9gMRClhEZrep8Yy8=; b=xlQdbs7APAzCY/j6XjkIle93SKbA2OU0OsLNkiA/PLMmm9XK6HUkpRuaVlnp2GHao3 5LAoB6y9CTSVmuukB/MRQ6iQVQ4F+Z2qB0L6OAmg7E/NnmKOUZ6cJPLJYN0djcmZA933 p1bZuLvs3APVNL0se0rpQEK+Mui1KTWbUolmqEslQjcGbOwnuMu/9YsTUkN37qWkoG3O jR2Fug1bkxXfZZ4F4NImKCSaAe6QDFdWgOPkzyq8ub5byGCg/Cmd2dWFo8XkuroiIog4 VxG/eYfT84XDWEERIBAb/+JdpoRFlVAMPGeC+qzUZ5HniwYAzlEi73egscA5GaG23xC5 FY4g== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 217.70.183.200 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net. [217.70.183.200]) by mx.google.com with ESMTPS id n5si513395edn.449.2019.04.17.23.08.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Apr 2019 23:08:35 -0700 (PDT) Received-SPF: neutral (google.com: 217.70.183.200 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) client-ip=217.70.183.200; Authentication-Results: mx.google.com; spf=neutral (google.com: 217.70.183.200 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr X-Originating-IP: 79.86.19.127 Received: from [192.168.0.11] (127.19.86.79.rev.sfr.net [79.86.19.127]) (Authenticated sender: alex@ghiti.fr) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 5721320005; Thu, 18 Apr 2019 06:08:31 +0000 (UTC) Subject: Re: [PATCH v3 10/11] mips: Use generic mmap top-down layout To: Kees Cook 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 , LKML , linux-arm-kernel , linux-mips@vger.kernel.org, linux-riscv@lists.infradead.org, "linux-fsdevel@vger.kernel.org" , Linux-MM References: <20190417052247.17809-1-alex@ghiti.fr> <20190417052247.17809-11-alex@ghiti.fr> From: Alex Ghiti Message-ID: <82116ac6-1997-b52d-b1dd-98cc97e731bf@ghiti.fr> Date: Thu, 18 Apr 2019 02:08:31 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: sv-FI X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 4/18/19 1:31 AM, Kees Cook wrote: > On Wed, Apr 17, 2019 at 12:33 AM Alexandre Ghiti wrote: >> mips uses a top-down layout by default that fits the generic functions. >> At the same time, this commit allows to fix problem uncovered >> and not fixed for mips here: >> https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1429066.html >> >> Signed-off-by: Alexandre Ghiti > Acked-by: Kees Cook Thanks ! > > -Kees > >> --- >> arch/mips/Kconfig | 1 + >> arch/mips/include/asm/processor.h | 5 --- >> arch/mips/mm/mmap.c | 67 ------------------------------- >> 3 files changed, 1 insertion(+), 72 deletions(-) >> >> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig >> index 4a5f5b0ee9a9..ec2f07561e4d 100644 >> --- a/arch/mips/Kconfig >> +++ b/arch/mips/Kconfig >> @@ -14,6 +14,7 @@ config MIPS >> select ARCH_USE_CMPXCHG_LOCKREF if 64BIT >> select ARCH_USE_QUEUED_RWLOCKS >> select ARCH_USE_QUEUED_SPINLOCKS >> + select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU >> select ARCH_WANT_IPC_PARSE_VERSION >> select BUILDTIME_EXTABLE_SORT >> select CLONE_BACKWARDS >> diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h >> index aca909bd7841..fba18d4a9190 100644 >> --- a/arch/mips/include/asm/processor.h >> +++ b/arch/mips/include/asm/processor.h >> @@ -29,11 +29,6 @@ >> >> extern unsigned int vced_count, vcei_count; >> >> -/* >> - * MIPS does have an arch_pick_mmap_layout() >> - */ >> -#define HAVE_ARCH_PICK_MMAP_LAYOUT 1 >> - >> #ifdef CONFIG_32BIT >> #ifdef CONFIG_KVM_GUEST >> /* User space process size is limited to 1GB in KVM Guest Mode */ >> diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c >> index ffbe69f3a7d9..61e65a69bb09 100644 >> --- a/arch/mips/mm/mmap.c >> +++ b/arch/mips/mm/mmap.c >> @@ -20,43 +20,6 @@ >> unsigned long shm_align_mask = PAGE_SIZE - 1; /* Sane caches */ >> EXPORT_SYMBOL(shm_align_mask); >> >> -/* 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); >> -} >> - >> #define COLOUR_ALIGN(addr, pgoff) \ >> ((((addr) + shm_align_mask) & ~shm_align_mask) + \ >> (((pgoff) << PAGE_SHIFT) & shm_align_mask)) >> @@ -154,36 +117,6 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp, >> addr0, len, pgoff, flags, DOWN); >> } >> >> -unsigned long arch_mmap_rnd(void) >> -{ >> - unsigned long rnd; >> - >> -#ifdef CONFIG_COMPAT >> - if (TASK_IS_32BIT_ADDR) >> - rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1); >> - else >> -#endif /* CONFIG_COMPAT */ >> - 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; >> - } >> -} >> - >> static inline unsigned long brk_rnd(void) >> { >> unsigned long rnd = get_random_long(); >> -- >> 2.20.1 >> >