From patchwork Fri Jun 27 23:17:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Hicks X-Patchwork-Id: 365210 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id D098A1400B5; Sat, 28 Jun 2014 09:19:13 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1X0fQF-0007eC-5A; Fri, 27 Jun 2014 23:19:11 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1X0fQ5-0007bT-Cj for kernel-team@lists.ubuntu.com; Fri, 27 Jun 2014 23:19:01 +0000 Received: from 23-123-229-184.lightspeed.rcsntx.sbcglobal.net ([23.123.229.184] helo=boyd.l.tihix.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1X0fQ5-0008Bt-1y; Fri, 27 Jun 2014 23:19:01 +0000 From: Tyler Hicks To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/8] UBUNTU: [Config] Sync LSM config options Date: Fri, 27 Jun 2014 18:17:59 -0500 Message-Id: <1403911081-32056-7-git-send-email-tyhicks@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403911081-32056-1-git-send-email-tyhicks@canonical.com> References: <1403911081-32056-1-git-send-email-tyhicks@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Sync with the traditional Ubuntu kernel config options in regards to LSM options. Signed-off-by: Tyler Hicks --- debian.flo/config/config.common.ubuntu | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian.flo/config/config.common.ubuntu b/debian.flo/config/config.common.ubuntu index 354c18b..6902210 100644 --- a/debian.flo/config/config.common.ubuntu +++ b/debian.flo/config/config.common.ubuntu @@ -2497,10 +2497,11 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_PATH=y CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_AVC_STATS=y -# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y -# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DISABLE=y # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set CONFIG_SECURITY_SMACK=y CONFIG_SECURITY_TOMOYO=y