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 554B3C10F0E for ; Thu, 18 Apr 2019 06:08:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DD332184B for ; Thu, 18 Apr 2019 06:08:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388010AbfDRGIh (ORCPT ); Thu, 18 Apr 2019 02:08:37 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:59965 "EHLO relay7-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725876AbfDRGIg (ORCPT ); Thu, 18 Apr 2019 02:08:36 -0400 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> > 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 CCBB0C10F0B for ; Thu, 18 Apr 2019 06:08:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B10D204FD for ; Thu, 18 Apr 2019 06:08:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SA8lWyvy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B10D204FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gH0+WtOJuCdVTy91xO4P6o858O1RE2Hpwxva9+8hKUk=; b=SA8lWyvyZO/1V9nxyWJpsj8rr D04SJo9BI7v9JBkiAHq61g6ydEemq6Pe9maozcO6u1TAebwdy0UtjCklRqyCPvS+Qz00JIXAiTMXY d0HX+TM0Zq2ga3QjXX8cRh1MocWC77Kh2o9tf1wbKt3+JxewNhu30KN/eM2/L6HL27jz9NSLhGk0M jDCHYmFckZlybTlJVeCO0rk7deZM1zWPJGRdqF3nOXM+FIcT+aP+iaxoScy9uBQRymG9615Qd1flb OqPMI3nuirsgLH025j+MuXC1B1WZ7RYi4uSPf5uXVHLLlaftWiSAv6Nk3BSv8iyLQb4FjtZqnDTuR waiyOYBdA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH0E2-0008Os-PR; Thu, 18 Apr 2019 06:08:46 +0000 Received: from relay7-d.mail.gandi.net ([217.70.183.200]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH0Ds-0008GM-TD; Thu, 18 Apr 2019 06:08:38 +0000 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 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-Language: sv-FI X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190417_230837_236211_03DA6333 X-CRM114-Status: GOOD ( 16.92 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Albert Ou , Catalin Marinas , Palmer Dabbelt , Will Deacon , Russell King , Ralf Baechle , LKML , Linux-MM , Paul Burton , linux-riscv@lists.infradead.org, Alexander Viro , James Hogan , "linux-fsdevel@vger.kernel.org" , Andrew Morton , linux-mips@vger.kernel.org, Christoph Hellwig , linux-arm-kernel , Luis Chamberlain Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org 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 >> > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 8CCF9C10F0B for ; Thu, 18 Apr 2019 06:08:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5B820204FD for ; Thu, 18 Apr 2019 06:08:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YBUfIosj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B820204FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=W7XRiTfFcOebUeUrLNrURhlhfVriFipLa3OLyltTon0=; b=YBUfIosjodyL8Uvct7kqzJm62 z/dUoA18hBJFLjtb4oZtuFBysD++u+M+M0CddKFbBlElWbIAbU3NO6x9GcETHsf50I7aGLVtAcSTj ypguGO9zpxFZbKD+JYNkPaJgfwsNb+UII+t8e2JrAMUXqyWg0qP3BdDtkyvGpwSZzyPrr1lvAgpHq MwEKkj9elon37h7keEEJXL2tSi9q3fuM6H684dt3xZSdWZwWa2tKid56/sxqYtDB44DVOnEOXrwNe 2sYnmMHpsnRx2j0rgktKGJrZZoHi6cHkDdOz22OlL31Nepp6YSJo7SIX8D75kfKAnplX6/2zN9ckf Su6iI2XrQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH0Dx-0008HM-7v; Thu, 18 Apr 2019 06:08:41 +0000 Received: from relay7-d.mail.gandi.net ([217.70.183.200]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH0Ds-0008GM-TD; Thu, 18 Apr 2019 06:08:38 +0000 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 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-Language: sv-FI X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190417_230837_236211_03DA6333 X-CRM114-Status: GOOD ( 16.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Albert Ou , Catalin Marinas , Palmer Dabbelt , Will Deacon , Russell King , Ralf Baechle , LKML , Linux-MM , Paul Burton , linux-riscv@lists.infradead.org, Alexander Viro , James Hogan , "linux-fsdevel@vger.kernel.org" , Andrew Morton , linux-mips@vger.kernel.org, Christoph Hellwig , linux-arm-kernel , Luis Chamberlain Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 >> > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel