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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 67DA4C0650F for ; Thu, 8 Aug 2019 09:20:29 +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 3C989217F4 for ; Thu, 8 Aug 2019 09:20:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="p9ZvxIgF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b="eGiX9Khh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C989217F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com 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=sTRSYCNJYzk+6idplO97Um98YJTw3PFJFE4TTzk47bg=; b=p9ZvxIgFyNfcBg6fwIewnq0f3 gTqQHY02rZ7ZvGY8ucKWdskp032hxn5DacBS+Su5bwXZHziisBqYN6tq/1x1DVAKhzCxMeMUOGVXC VR2AepH3EWLHbha7zGiAH9HTW+TQJWqC46TGsMz2Tkp1rSLq1n73oilxNQTq5AEyiECfFpPwRYrBb 4V613qaRV7kOmNQjsz77AyfErM6mbvVf1EWi/eevKCLDvcxv21IOLQcxcUhuOoJuTMQXG/NDRjQNN BtNYPObdFZmLV7mcRGjoRurQz+TajQjWG2SYjOzDy5+8uuWz0xu9b4hhb/nwU9zOKOp5JePifqon2 FkF630wCA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hveay-0000B0-IB; Thu, 08 Aug 2019 09:20:28 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hveah-0008MW-Ho for linux-arm-kernel@lists.infradead.org; Thu, 08 Aug 2019 09:20:13 +0000 Received: by mail-lj1-x243.google.com with SMTP id t28so88202252lje.9 for ; Thu, 08 Aug 2019 02:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=OCitiiIQARt2srQdTEp8HHKk2MswJS9hy+qm/HN3L5Q=; b=eGiX9Khh6PGwyt3vEDZS5i+7Ttn3dev6cKijGsAKu98PEo2SOHWYpChGzAR8G6rqiH jzgQRh6WatLMuo4AbNf4LAJr20oUT+cZdU/1CJnSqTguKc+Ybw4jmkdw0OadBReXodeF ebkbMHm8MDy0PwD/pEvqEAPbq07rO3qstGtOj2YxInvoyEp2nXA39FzVCr7+4l19jsYI 3s9hm6A/4KWKEqwiGw05Tvffpb0A0mj+ayAeSD24M3N45J6I7gHbT2TjJqBsaCxM8sqn rQPLBU1qx5jTkktaKHQLtADroikDfkHoEs6q4//nMMWQlm8Px3F2v3VdsnP0ZIgPpvGb 4l2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=OCitiiIQARt2srQdTEp8HHKk2MswJS9hy+qm/HN3L5Q=; b=N1ZG++lJbLUuyGbYFbbluxfm4bnWGqEcdqT3NiFyMRtWNIa+rfV3zJa7m2aDuG4AEf CwofC2yuQDuAMcblKByAimqLi68pIGHgZSwBL42wgRQ+WD3Oe2HA0NxNtVZsBSdlyizi 7dkwNhXF6l8OsSRF4dwozbrw9zarmgsHcELO8f8IDQJBlNhYuQVLvCTl2AUjfYQFvLnI ujvqF8SraHaquPlTslW1GD2hTMtLARAEGLbAE81skYEasR4QIM18EKZsPs5qLRIu1y+M QtXDuWi47HHhqeppQWCdzeKUh5EvqoA+Ji/BPginqTH3Nv2T31+HDIj7K5/loAYjoYgO KFQw== X-Gm-Message-State: APjAAAW+ZV8JtB//tbRYxXm5vCZF1g+1noXVk4AmbCB4cPgfafdZZycg Aqgwutg2D/+lhkBdEHdkSrAi/Q== X-Google-Smtp-Source: APXvYqwAgmAyvFxsvAFzBlQwmsh/xeHT2UOBWqRNNJ6VrtKLtOr+7Myij8Z/3eE0oJPU4/4mQFntnQ== X-Received: by 2002:a2e:9685:: with SMTP id q5mr6063276lji.227.1565256009622; Thu, 08 Aug 2019 02:20:09 -0700 (PDT) Received: from ?IPv6:2a00:1fa0:8c7:ada9:25b2:24d8:3973:eb87? ([2a00:1fa0:8c7:ada9:25b2:24d8:3973:eb87]) by smtp.gmail.com with ESMTPSA id u27sm17024138lfn.87.2019.08.08.02.20.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 02:20:08 -0700 (PDT) Subject: Re: [PATCH v6 11/14] mips: Adjust brk randomization offset to fit generic version To: Alexandre Ghiti , Andrew Morton References: <20190808061756.19712-1-alex@ghiti.fr> <20190808061756.19712-12-alex@ghiti.fr> From: Sergei Shtylyov Message-ID: <68ec5cf6-6ba3-68ab-aa01-668b701c642f@cogentembedded.com> Date: Thu, 8 Aug 2019 12:19:56 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190808061756.19712-12-alex@ghiti.fr> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190808_022011_827427_2DE19F57 X-CRM114-Status: GOOD ( 16.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Albert Ou , Kees Cook , linux-mm@kvack.org, Catalin Marinas , Palmer Dabbelt , Will Deacon , Russell King , Ralf Baechle , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Luis Chamberlain , Paul Burton , Paul Walmsley , James Hogan , linux-riscv@lists.infradead.org, linux-mips@vger.kernel.org, Christoph Hellwig , linux-arm-kernel@lists.infradead.org, Alexander Viro 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 Hello! On 08.08.2019 9:17, Alexandre Ghiti wrote: > This commit simply bumps up to 32MB and 1GB the random offset > of brk, compared to 8MB and 256MB, for 32bit and 64bit respectively. > > Suggested-by: Kees Cook > Signed-off-by: Alexandre Ghiti > Acked-by: Paul Burton > Reviewed-by: Kees Cook > Reviewed-by: Luis Chamberlain > --- > arch/mips/mm/mmap.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c > index a7e84b2e71d7..ff6ab87e9c56 100644 > --- a/arch/mips/mm/mmap.c > +++ b/arch/mips/mm/mmap.c [...] > @@ -189,11 +190,11 @@ static inline unsigned long brk_rnd(void) > unsigned long rnd = get_random_long(); > > rnd = rnd << PAGE_SHIFT; > - /* 8MB for 32bit, 256MB for 64bit */ > + /* 32MB for 32bit, 1GB for 64bit */ > if (TASK_IS_32BIT_ADDR) > - rnd = rnd & 0x7ffffful; > + rnd = rnd & (SZ_32M - 1); > else > - rnd = rnd & 0xffffffful; > + rnd = rnd & (SZ_1G - 1); Why not make these 'rnd &= SZ_* - 1', while at it anyways? [...] MBR, Sergei _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel