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 B90FEC10F14 for ; Thu, 18 Apr 2019 05:28:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8742E217F9 for ; Thu, 18 Apr 2019 05:28:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="hNSJWi7d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387932AbfDRF2J (ORCPT ); Thu, 18 Apr 2019 01:28:09 -0400 Received: from mail-ua1-f68.google.com ([209.85.222.68]:37663 "EHLO mail-ua1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726518AbfDRF2I (ORCPT ); Thu, 18 Apr 2019 01:28:08 -0400 Received: by mail-ua1-f68.google.com with SMTP id l17so384258uar.4 for ; Wed, 17 Apr 2019 22:28:08 -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=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=hNSJWi7dfZS6icOBYs4kZRM3P2+rnM98qjGabtZHa2binvsfr93Ocxkw+IwxUASlD/ pQX01+gyN8BW8yJYMgeqgS/eAzOZQEpQCg6E3xJ+hbrCPgvJPgJJi4wI0J+FiIbsUSP6 0k+cQm02mdD+oM5hLDG6hhfyjMKa1vlN3OhUw= 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=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=slPtIjPUyAqgAl40PVBBRJ3a8Va9kNU3+Nj0Je5aEI6chxdlVZOwuM59tNioGlVWgy hQpOEoojkguVZ+mGgiDJS3+/Tk/GsVEBGg3u3xsBm/giGhC7FH9jeA/EVFWa0G2+kOpd Rx8mVy8ntZLoZizKgaHnyVI5ffERf4Nl8sgdZyjUm8ohNxfeKRc58lFUnmiBsGO+HvJJ LhTli0KhXbLH5KQvoEIK/+ikVMhwVs5zCS2rpv3LiQYSrjB3v7HMEhxBWsTeqFqzCXPn nfm3sO/dnVTIyuHeRclbPdilDF6AHqom80B03GmI8nJhloCdIhGc0nFF16Srby4sNMKs r8Fw== X-Gm-Message-State: APjAAAU5Vto9XIKkLryzTfAAGjn3EsKcF+mG8pNiE0y8KDFYJL/40SbH knAJMe6UXbmIeEJ1JtRKLCACyAELJZE= X-Google-Smtp-Source: APXvYqw9tmb/CGMGWk+71LHd848nPVJM5EoHI/xtkV6cXR7L0g01OezWW1hEH2KDDAVUJ9PA1jjwng== X-Received: by 2002:ab0:2b98:: with SMTP id q24mr12438761uar.122.1555565287601; Wed, 17 Apr 2019 22:28:07 -0700 (PDT) Received: from mail-vk1-f176.google.com (mail-vk1-f176.google.com. [209.85.221.176]) by smtp.gmail.com with ESMTPSA id b5sm199541vsd.18.2019.04.17.22.28.05 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 22:28:05 -0700 (PDT) Received: by mail-vk1-f176.google.com with SMTP id q189so205482vkq.11 for ; Wed, 17 Apr 2019 22:28:05 -0700 (PDT) X-Received: by 2002:a1f:2e07:: with SMTP id u7mr49260276vku.44.1555565284857; Wed, 17 Apr 2019 22:28:04 -0700 (PDT) MIME-Version: 1.0 References: <20190417052247.17809-1-alex@ghiti.fr> <20190417052247.17809-7-alex@ghiti.fr> In-Reply-To: <20190417052247.17809-7-alex@ghiti.fr> From: Kees Cook Date: Thu, 18 Apr 2019 00:27:53 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 06/11] arm: Use STACK_TOP when computing mmap base address 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 17, 2019 at 12:29 AM Alexandre Ghiti wrote: > > mmap base address must be computed wrt stack top address, using TASK_SIZE > is wrong since STACK_TOP and TASK_SIZE are not equivalent. > > Signed-off-by: Alexandre Ghiti > --- > arch/arm/mm/mmap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c > index bff3d00bda5b..0b94b674aa91 100644 > --- a/arch/arm/mm/mmap.c > +++ b/arch/arm/mm/mmap.c > @@ -19,7 +19,7 @@ > > /* gap between mmap and stack */ > #define MIN_GAP (128*1024*1024UL) > -#define MAX_GAP ((TASK_SIZE)/6*5) > +#define MAX_GAP ((STACK_TOP)/6*5) Parens around STACK_TOP aren't needed, but you'll be removing it entirely, so I can't complain. ;) > #define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12)) > > static int mmap_is_legacy(struct rlimit *rlim_stack) > @@ -51,7 +51,7 @@ static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack) > else if (gap > MAX_GAP) > gap = MAX_GAP; > > - return PAGE_ALIGN(TASK_SIZE - gap - rnd); > + return PAGE_ALIGN(STACK_TOP - gap - rnd); > } > > /* > -- > 2.20.1 > Acked-by: Kees Cook -- Kees Cook 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=ham 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 EE1C6C10F0B for ; Thu, 18 Apr 2019 05:28:15 +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 B695D21479 for ; Thu, 18 Apr 2019 05:28:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TQZuA7RR"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="hNSJWi7d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B695D21479 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IkeKupAJcbgKNgpFsdzG0mha0RuAtc6ZXIipiQ0BXjI=; b=TQZuA7RRRmPSdc 0kqgJ5+UqIKBOXrU1vd+rXVlZFSMxwG1QR3uIbMvGHUo/uIW4/zOZWIMAgENm37b+A6ijwMOFYXPH FwOEu5R2Ik+X2MR/cyVSqE3kr6fR1v04+JT3S2toFF19qddjfcOFfEBPXE49V4wScMUrM6wTAHjqp tyNXuSQP/pIq0a+UM13AF3RqduXFqV0U9zvsCQvqzgzg6BLfGfMXFiQZd2U++R4JCeZCE2IhgbRvi lIFsOK6szaZrPHbQHolkW0vmCcLHp9z/hYQbCg0vvxgmq85E/xFdgbIRnujjovJYD0a1de54vHj2O wZy7wAjz4QoJJfyFZNjw==; 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 1hGzal-0008QJ-EC; Thu, 18 Apr 2019 05:28:11 +0000 Received: from mail-vs1-xe41.google.com ([2607:f8b0:4864:20::e41]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGzai-0008Pc-Ad for linux-riscv@lists.infradead.org; Thu, 18 Apr 2019 05:28:09 +0000 Received: by mail-vs1-xe41.google.com with SMTP id s2so508666vsi.5 for ; Wed, 17 Apr 2019 22:28:08 -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=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=hNSJWi7dfZS6icOBYs4kZRM3P2+rnM98qjGabtZHa2binvsfr93Ocxkw+IwxUASlD/ pQX01+gyN8BW8yJYMgeqgS/eAzOZQEpQCg6E3xJ+hbrCPgvJPgJJi4wI0J+FiIbsUSP6 0k+cQm02mdD+oM5hLDG6hhfyjMKa1vlN3OhUw= 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=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=M/CIG9Fx3LVNNtWKARmQ6qnghx9jWFu+PFrilA7dYp1DrG1jnhw+eGakkuY21S9LB/ KJ2G69CV5XK7TE1aPRS15HTk52o0qqGwhYaZzIJa6RwQhA4kFqjbH1OHMrDsDA/pzztx C1+DPOkY5Jyb9WTRFeJR7JGs/baBecK/aIB4W5Wg880yYZ6QtEWG+ebvSv+U+pusP82B 9CcpB9BACKktg2ae3GZiHiORL24BMuEZ8dAmyUVhr/Dt5nwzB3PMu9DMOk9+DFWw/5EE DKTwE6IBdHVXMBLiOKGc3L8M0YkY1Hv56+gBrtdsYibGhQ9LQ2Ru/fspoYq8uxD3R0eb 1gKQ== X-Gm-Message-State: APjAAAUqKkLUhZSaJLYY1xXrDUTxGt8mbLdjVzDIiddxhP9/n9nS/IDj zaGrwsimtZTE10tAS/WBoRnRl4e7aH4= X-Google-Smtp-Source: APXvYqxA3bo7o54KvVut2LsGqTMyYy+Nk6LdOLF7bBCdGvJh9GradZEfy2O309NSHaQpcpbgkO9HMQ== X-Received: by 2002:a67:f615:: with SMTP id k21mr50879865vso.136.1555565286546; Wed, 17 Apr 2019 22:28:06 -0700 (PDT) Received: from mail-vk1-f181.google.com (mail-vk1-f181.google.com. [209.85.221.181]) by smtp.gmail.com with ESMTPSA id e81sm412142vkd.56.2019.04.17.22.28.05 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 22:28:05 -0700 (PDT) Received: by mail-vk1-f181.google.com with SMTP id x84so220224vkd.1 for ; Wed, 17 Apr 2019 22:28:05 -0700 (PDT) X-Received: by 2002:a1f:2e07:: with SMTP id u7mr49260276vku.44.1555565284857; Wed, 17 Apr 2019 22:28:04 -0700 (PDT) MIME-Version: 1.0 References: <20190417052247.17809-1-alex@ghiti.fr> <20190417052247.17809-7-alex@ghiti.fr> In-Reply-To: <20190417052247.17809-7-alex@ghiti.fr> From: Kees Cook Date: Thu, 18 Apr 2019 00:27:53 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 06/11] arm: Use STACK_TOP when computing mmap base address To: Alexandre Ghiti X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190417_222808_368906_1D5FC77D X-CRM114-Status: GOOD ( 15.89 ) 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 , Kees Cook , 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org On Wed, Apr 17, 2019 at 12:29 AM Alexandre Ghiti wrote: > > mmap base address must be computed wrt stack top address, using TASK_SIZE > is wrong since STACK_TOP and TASK_SIZE are not equivalent. > > Signed-off-by: Alexandre Ghiti > --- > arch/arm/mm/mmap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c > index bff3d00bda5b..0b94b674aa91 100644 > --- a/arch/arm/mm/mmap.c > +++ b/arch/arm/mm/mmap.c > @@ -19,7 +19,7 @@ > > /* gap between mmap and stack */ > #define MIN_GAP (128*1024*1024UL) > -#define MAX_GAP ((TASK_SIZE)/6*5) > +#define MAX_GAP ((STACK_TOP)/6*5) Parens around STACK_TOP aren't needed, but you'll be removing it entirely, so I can't complain. ;) > #define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12)) > > static int mmap_is_legacy(struct rlimit *rlim_stack) > @@ -51,7 +51,7 @@ static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack) > else if (gap > MAX_GAP) > gap = MAX_GAP; > > - return PAGE_ALIGN(TASK_SIZE - gap - rnd); > + return PAGE_ALIGN(STACK_TOP - gap - rnd); > } > > /* > -- > 2.20.1 > Acked-by: Kees Cook -- Kees Cook _______________________________________________ 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.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=ham 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 F18E5C10F0B for ; Thu, 18 Apr 2019 05:28:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 983CA217F9 for ; Thu, 18 Apr 2019 05:28:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="hNSJWi7d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 983CA217F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 362506B0005; Thu, 18 Apr 2019 01:28:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 310D16B0006; Thu, 18 Apr 2019 01:28:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 203276B0007; Thu, 18 Apr 2019 01:28:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by kanga.kvack.org (Postfix) with ESMTP id ED4196B0005 for ; Thu, 18 Apr 2019 01:28:08 -0400 (EDT) Received: by mail-vs1-f70.google.com with SMTP id b16so181785vsp.19 for ; Wed, 17 Apr 2019 22:28:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:mime-version:references :in-reply-to:from:date:message-id:subject:to:cc; bh=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=JUAJAiG80lkY4fc8PhpsGpOL7ZdUaNdqHrjZeb8IptKWZqnoXqROXzR5tIX+0b9h3P uPPt+gIbrSjgmPIT0JzGEEdLHRNmgefLrmxZmnhcZEYKUfodk3ZhH9GINdU2lgDmB3ia oyR3GtkxnNVogN1fMShBrHDJPfyWDzOgQf/4IjITBBe4+AarZ2+OBVAOy7AsY/BUq4Jr o1W2BwhVPvDZ4VkqfJt8NZoH0OJIB1V57ORXLL5WCJAbeVtae5GHr7+k70grZxgAW4rm WZsXRzxZem9ZaCL/MUiMIq3olsbsmnHyo85dy6NpqzjiMY4FQQujl+QIMheDhODcB3uC OROw== X-Gm-Message-State: APjAAAVhccLO9IxS9z4yKGMS55k4l7MZYU50lqLgNBhsBT7uclW9vZh4 wa0f65k9Xh+wMu7PVMNQM/spN+prfemXjIT5ksz60JmHxl97E7/hbgQ3TktZQX+LZ6TxkmS34pf VBA7hqj1WzQKzf4cy0iizYK6yAg+acIqWThDVnhYegtiNqXhJZIbeFtksguwUMsyS3w== X-Received: by 2002:a67:99c3:: with SMTP id b186mr33184069vse.50.1555565288667; Wed, 17 Apr 2019 22:28:08 -0700 (PDT) X-Received: by 2002:a67:99c3:: with SMTP id b186mr33184054vse.50.1555565288007; Wed, 17 Apr 2019 22:28:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555565288; cv=none; d=google.com; s=arc-20160816; b=vBQ9M8oeGWUSIUMjgYL1m3PghY72aYi0P/i9YJvv8gYKlDK1xbNnZAxcyR+eSSHXOU 3V/Ei5Y1Q1BMBgBIEGNgJX5EOCtbcG46N2SRiwyrjiXvtZQK4QWBQHFVy2WVtkZ+u7Qt Qf/Us0Mc2gUvKN9qdLkCVGILpuHlwfQHHmzan9BQGCQfEhii1eKnLz1Mm/0+E2mCqLdE YwO4OktH2NhD+wCL9LMXi4c4zkoM16rH4Mx6liG6/7DUecvuTsN5bUz+6Pf3hGvr7OTx RIbJJb4pM4XN4MBcsfqIeUvAqFS+Ax5vdvim7vtb5DlGsW2a8WRjOvAJz9G7SMePOvyJ U+8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=uP5rLLZV2hncR9z6ezoeqqthS9MAtnErv9mfltzi1TEnco1SE60d2oxHKBjh6Xxixp VU2d2hgBL37bgYxpB0Eo10SoyaDu8MZJQcaaK3FWlIGkp5uvExtb8/L+v+Uxjkx4bHkx D4WEmra5NQKysW8Yh/CxjoqkYjWApFzDU9cRowyk73evc2ZrXwC5P+PafKOsKErQxTsn azpi/0guMCeJxHLHRhg5ys62+E1ELyEczQS5pUQPy8DaFUcUZA2XAsaRtnAGI5R1e2k2 lmTc+AKu/HQZPolQ6EK7PbRqtq2JPAq7OITT5MAZJhjR2DPhIgnZV4etUaH+jKVKfP5V UW4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=hNSJWi7d; spf=pass (google.com: domain of keescook@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m23sor362979vsn.114.2019.04.17.22.28.07 for (Google Transport Security); Wed, 17 Apr 2019 22:28:07 -0700 (PDT) Received-SPF: pass (google.com: domain of keescook@chromium.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=hNSJWi7d; spf=pass (google.com: domain of keescook@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org 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=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=hNSJWi7dfZS6icOBYs4kZRM3P2+rnM98qjGabtZHa2binvsfr93Ocxkw+IwxUASlD/ pQX01+gyN8BW8yJYMgeqgS/eAzOZQEpQCg6E3xJ+hbrCPgvJPgJJi4wI0J+FiIbsUSP6 0k+cQm02mdD+oM5hLDG6hhfyjMKa1vlN3OhUw= X-Google-Smtp-Source: APXvYqyIlUw+cIPLxwx8PU4Wic4h/C7/huLiqIy6JZeIm/vPCHtud3xYwgJR/lpvXIy3WD2NOTgq6w== X-Received: by 2002:a67:82c8:: with SMTP id e191mr50839838vsd.24.1555565287061; Wed, 17 Apr 2019 22:28:07 -0700 (PDT) Received: from mail-vk1-f182.google.com (mail-vk1-f182.google.com. [209.85.221.182]) by smtp.gmail.com with ESMTPSA id t207sm385796vkb.21.2019.04.17.22.28.05 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 22:28:05 -0700 (PDT) Received: by mail-vk1-f182.google.com with SMTP id x2so202769vkx.13 for ; Wed, 17 Apr 2019 22:28:05 -0700 (PDT) X-Received: by 2002:a1f:2e07:: with SMTP id u7mr49260276vku.44.1555565284857; Wed, 17 Apr 2019 22:28:04 -0700 (PDT) MIME-Version: 1.0 References: <20190417052247.17809-1-alex@ghiti.fr> <20190417052247.17809-7-alex@ghiti.fr> In-Reply-To: <20190417052247.17809-7-alex@ghiti.fr> From: Kees Cook Date: Thu, 18 Apr 2019 00:27:53 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 06/11] arm: Use STACK_TOP when computing mmap base address 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" 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 Wed, Apr 17, 2019 at 12:29 AM Alexandre Ghiti wrote: > > mmap base address must be computed wrt stack top address, using TASK_SIZE > is wrong since STACK_TOP and TASK_SIZE are not equivalent. > > Signed-off-by: Alexandre Ghiti > --- > arch/arm/mm/mmap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c > index bff3d00bda5b..0b94b674aa91 100644 > --- a/arch/arm/mm/mmap.c > +++ b/arch/arm/mm/mmap.c > @@ -19,7 +19,7 @@ > > /* gap between mmap and stack */ > #define MIN_GAP (128*1024*1024UL) > -#define MAX_GAP ((TASK_SIZE)/6*5) > +#define MAX_GAP ((STACK_TOP)/6*5) Parens around STACK_TOP aren't needed, but you'll be removing it entirely, so I can't complain. ;) > #define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12)) > > static int mmap_is_legacy(struct rlimit *rlim_stack) > @@ -51,7 +51,7 @@ static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack) > else if (gap > MAX_GAP) > gap = MAX_GAP; > > - return PAGE_ALIGN(TASK_SIZE - gap - rnd); > + return PAGE_ALIGN(STACK_TOP - gap - rnd); > } > > /* > -- > 2.20.1 > Acked-by: Kees Cook -- Kees Cook 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=ham 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 23C51C10F0E for ; Thu, 18 Apr 2019 05:28:18 +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 D07A021479 for ; Thu, 18 Apr 2019 05:28:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bHD1UqeN"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="hNSJWi7d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D07A021479 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0tUxk7kl/dRDs7WImA+foJsjfUpGwvmhXS+E/n67Cl4=; b=bHD1UqeNKEfQ/7 hwl3qiyUqyIfx6AotC939iW0unKh6KShJ0wTzxcxGsvM7AuBmd+BgrN+Y6hqWlJGNzt3IZSv2Ygdx 1FaeQ+W1RgBSAvUNAJ7YgEVW4k/p8gDCGz6gMG4KeuKuOESfhyrDPNfqBreIsva79bZdSOBIf8xpb tW1D/SdVsUnfcC7uVrHf+UniD93Wc6/Nmb8CBT/h+icRbsoCUD1wBYZeaPvd65z300HR+GhkAc1nh x4lPfhMmZmFQBhkTOf1bVtccEQLbejw0wyz6umlz3yvdYgDzafG7g3j9mibpCaxt4v1TBWhyaQxbl vY0vKE1ynHXA81Eo8+2w==; 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 1hGzan-0008S4-De; Thu, 18 Apr 2019 05:28:13 +0000 Received: from mail-ua1-x941.google.com ([2607:f8b0:4864:20::941]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGzak-0008Pv-8x for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2019 05:28:11 +0000 Received: by mail-ua1-x941.google.com with SMTP id n16so370853uae.10 for ; Wed, 17 Apr 2019 22:28:09 -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=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=hNSJWi7dfZS6icOBYs4kZRM3P2+rnM98qjGabtZHa2binvsfr93Ocxkw+IwxUASlD/ pQX01+gyN8BW8yJYMgeqgS/eAzOZQEpQCg6E3xJ+hbrCPgvJPgJJi4wI0J+FiIbsUSP6 0k+cQm02mdD+oM5hLDG6hhfyjMKa1vlN3OhUw= 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=ohjMtnRuoMZoK8NFCIw9UXTAaT8mCgqZCZ9c725i5mE=; b=CoUWOz8i7J1oqafQII9qXuBkprf5Yy6JqQnArgl8EkVjmq6+/HmkYyBwYJn7bG3Nhe UrU88Fhe8NoVt32wuW6HvKQ6Fz8nA/RQBisfDTqED1Eeo8mHdGAx6/veqsNNRPjr1mpI xli+I2pTMYKk3Nhhxy8YSpx+t5jfc2sHnacsbDbHsk1qUvq+ROFQi/LVMJqH6hw6Yat3 Vab8kVgWTuLubc+JD4T5Z/b78hOTgySzyGeHwVqcnL3H3Pj3Gnx/R0bir9LyMv3HoDl9 6vTKDmXEfLTe8gXHyaN9ZztPjZ2ng5vtROT0SOg9+LRQ0gSjbn8Qslphr0MAARMCDkY+ Tizw== X-Gm-Message-State: APjAAAXpE8JjKwH3BHiKQeGWV7Hrka7H7dgLZQ8sV8ZVx3pexDf2Z8be HSUdXfW5CVL9/TPp5GTU581DR4E1nRk= X-Google-Smtp-Source: APXvYqxi+GEp7qFOLLCsytesoIaOO3zhpRj1EqwNMcy+lTwA2NS/BOEuCjbtCAk1nQMIeIE4tD/0jg== X-Received: by 2002:ab0:6815:: with SMTP id z21mr47084861uar.23.1555565288285; Wed, 17 Apr 2019 22:28:08 -0700 (PDT) Received: from mail-vk1-f182.google.com (mail-vk1-f182.google.com. [209.85.221.182]) by smtp.gmail.com with ESMTPSA id t198sm229628vst.11.2019.04.17.22.28.05 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 22:28:05 -0700 (PDT) Received: by mail-vk1-f182.google.com with SMTP id s63so206590vkg.10 for ; Wed, 17 Apr 2019 22:28:05 -0700 (PDT) X-Received: by 2002:a1f:2e07:: with SMTP id u7mr49260276vku.44.1555565284857; Wed, 17 Apr 2019 22:28:04 -0700 (PDT) MIME-Version: 1.0 References: <20190417052247.17809-1-alex@ghiti.fr> <20190417052247.17809-7-alex@ghiti.fr> In-Reply-To: <20190417052247.17809-7-alex@ghiti.fr> From: Kees Cook Date: Thu, 18 Apr 2019 00:27:53 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 06/11] arm: Use STACK_TOP when computing mmap base address To: Alexandre Ghiti X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190417_222810_312794_D7AAD474 X-CRM114-Status: GOOD ( 17.53 ) 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 , Kees Cook , 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Apr 17, 2019 at 12:29 AM Alexandre Ghiti wrote: > > mmap base address must be computed wrt stack top address, using TASK_SIZE > is wrong since STACK_TOP and TASK_SIZE are not equivalent. > > Signed-off-by: Alexandre Ghiti > --- > arch/arm/mm/mmap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c > index bff3d00bda5b..0b94b674aa91 100644 > --- a/arch/arm/mm/mmap.c > +++ b/arch/arm/mm/mmap.c > @@ -19,7 +19,7 @@ > > /* gap between mmap and stack */ > #define MIN_GAP (128*1024*1024UL) > -#define MAX_GAP ((TASK_SIZE)/6*5) > +#define MAX_GAP ((STACK_TOP)/6*5) Parens around STACK_TOP aren't needed, but you'll be removing it entirely, so I can't complain. ;) > #define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12)) > > static int mmap_is_legacy(struct rlimit *rlim_stack) > @@ -51,7 +51,7 @@ static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack) > else if (gap > MAX_GAP) > gap = MAX_GAP; > > - return PAGE_ALIGN(TASK_SIZE - gap - rnd); > + return PAGE_ALIGN(STACK_TOP - gap - rnd); > } > > /* > -- > 2.20.1 > Acked-by: Kees Cook -- Kees Cook _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel