From patchwork Tue Feb 4 02:15:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Cross X-Patchwork-Id: 3573681 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ECE7DC02DC for ; Tue, 4 Feb 2014 02:16:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E22B2016C for ; Tue, 4 Feb 2014 02:16:41 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6645E20166 for ; Tue, 4 Feb 2014 02:16:40 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAVYc-0001Wa-4w; Tue, 04 Feb 2014 02:16:14 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAVYU-0001Tk-2l; Tue, 04 Feb 2014 02:16:06 +0000 Received: from mail-pb0-f73.google.com ([209.85.160.73]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAVYQ-0001SE-He for linux-arm-kernel@lists.infradead.org; Tue, 04 Feb 2014 02:16:03 +0000 Received: by mail-pb0-f73.google.com with SMTP id rq2so1127785pbb.0 for ; Mon, 03 Feb 2014 18:15:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=snKs82D0aYo9VTxBFD2Y6dGn2VfxbYYCAo5JXQT6s4o=; b=dBDsB6l8Uk+oHip+ustRf3yXPGiD5f9gxiZ8wicH5lq/4DwWFa8cpsusf1VvhmLUie Yt0sXGxjmJNO4/8cdYKBE8glR6+JYbPFJ0MKHvXJh36aL5FyhnPgtLiq5xZBQ+rnlu9j 6qx1aKhLA1LA6QykBy3UHOlm9DvD4I98I3DTtpbwJ9PVglCdB4YC5sJfot2qUQ1n5QGq E7OeoNQog38UqqRVM5UGpzMFaglUT8ZB0YVvWlXYME4VWA4s/kVE6UdK8Yr0k6O2CMsq Cc1WVSj5GDKs3EhWi2jbwKtCD0V4bh7kjLkuNjYPU+OEVczlI7llMQP6fuTphhUYUGma FtsQ== X-Gm-Message-State: ALoCoQlrHV9ggMlfGeGR8aJmp4NzsSPSQNGTBApn2K5yqJLJEhJmSaXkLdukFGpSupWI0Xkz/+tnRNC0CaeS3YxeQxp9iW/bMETy05VVXHLfuj96Fz+bvYi8f+xEZwmyEAamob539glHqnRpMEzy7El7gUJOMDtWwAI2HhG4TlYUDVGcIw4FA+eK0NUdB5yA/Y4m4b6sJWfM0jf5DXuNvFh8PO7JIKs+jA== X-Received: by 10.66.141.231 with SMTP id rr7mr1313280pab.47.1391480135420; Mon, 03 Feb 2014 18:15:35 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id i24si1380394yhe.6.2014.02.03.18.15.35 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Feb 2014 18:15:35 -0800 (PST) Received: from walnut.mtv.corp.google.com (walnut.mtv.corp.google.com [172.18.120.100]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 391685A41F4; Mon, 3 Feb 2014 18:15:35 -0800 (PST) Received: by walnut.mtv.corp.google.com (Postfix, from userid 99897) id C25741603AD; Mon, 3 Feb 2014 18:15:34 -0800 (PST) From: Colin Cross To: linux-kernel@vger.kernel.org Subject: [PATCH] security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64 Date: Mon, 3 Feb 2014 18:15:32 -0800 Message-Id: <1391480133-27149-1-git-send-email-ccross@android.com> X-Mailer: git-send-email 1.9.0.rc1.175.g0b1dcb5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140203_211602_657961_5DD562FA X-CRM114-Status: UNSURE ( 9.17 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.1 (---) Cc: Catalin Marinas , Will Deacon , "open list:SECURITY SUBSYSTEM" , James Morris , Colin Cross , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Binaries compiled for arm may run on arm64 if CONFIG_COMPAT is selected. Set LSM_MMAP_MIN_ADDR to 32768 if ARM64 && COMPAT to prevent selinux failures launching 32-bit static executables that are mapped at 0x8000. Signed-off-by: Colin Cross Acked-by: Eric Paris Acked-by: Catalin Marinas Acked-by: James Morris --- security/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/Kconfig b/security/Kconfig index e9c6ac724fef..beb86b500adf 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -103,7 +103,7 @@ config INTEL_TXT config LSM_MMAP_MIN_ADDR int "Low address space for LSM to protect from user allocation" depends on SECURITY && SECURITY_SELINUX - default 32768 if ARM + default 32768 if ARM || (ARM64 && COMPAT) default 65536 help This is the portion of low virtual memory which should be protected