From patchwork Fri Aug 9 14:49:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1144751 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ubuntu.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=surgut.co.uk header.i=@surgut.co.uk header.b="S/+cOpeu"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 464p7001tPz9sPM; Sat, 10 Aug 2019 00:49:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hw6D9-0005ET-Vr; Fri, 09 Aug 2019 14:49:43 +0000 Received: from mail-wm1-f67.google.com ([209.85.128.67]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1hw6D8-0005Dy-3P for kernel-team@lists.ubuntu.com; Fri, 09 Aug 2019 14:49:42 +0000 Received: by mail-wm1-f67.google.com with SMTP id l2so5877775wmg.0 for ; Fri, 09 Aug 2019 07:49:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=surgut.co.uk; s=google; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aW7vXAYcp5qV7safEuGeWSBnt3y1QL473tE2caefFHo=; b=S/+cOpeuOqieAg3oWQFa8IxcMIL5Nnoc8Mm3qNs1YaffboBVwOQsEPODVqfmXkEZcy TsV7MX19EoqS7SDE1z/flWRh5XPh9c3d+xhqXkq1D8a4XCkh2t+xn1vvjAsq413CP7RG oPK4sPO7f30oNfT4V5fTG+cEm9zLVyYjAikLs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aW7vXAYcp5qV7safEuGeWSBnt3y1QL473tE2caefFHo=; b=sXeuY3STDqYX8IgwhwHbevMQYKmiqwVL2kt4VzxXGxDzPmMbBfU8o7q5T1Hy9T1CrJ Jx8N8gOoAa7SVOVDX9nt3lnvVOoSlikAS/IW+hm4AP6IEgl6ZU0mDwMMmbYBTcfNdq6E BtwmjnXt9/SyiYQr3RBdjtbbZ8TxJK/Sw9xfrnLBafo7ohKHu70cP6u3CfVP8sBls1h0 3SnpGoQVOgZyi1wKb7rKp62rH7hnanhyOInQA4S7yNIWW4p6z+vrd7sNv4HyqjmOygh1 Z72iPZ3/OL7GMAMpJF4MRNMUl1zYpEKXH3pAKGBVnZuol7vjlooIxWHq0c/fNGnVZGHo bTEw== X-Gm-Message-State: APjAAAXgqAQRbHT+yiMJdxI2TJQKPaxM1204bKQfcNFQhBzpPpKfkMrY TPRIM7ZDp06Zw8aU5W6fmGTGsDhtjwc= X-Google-Smtp-Source: APXvYqyBH6rDY5cWspdacbvJsquXtoHbaCeaSy2HmmJNfaoiZYPi+8jR4Nig68tfsjLgpytOoHobnA== X-Received: by 2002:a7b:c310:: with SMTP id k16mr10862322wmj.133.1565362181339; Fri, 09 Aug 2019 07:49:41 -0700 (PDT) Received: from localhost (9.a.8.f.7.f.e.f.f.f.2.3.f.4.a.1.1.4.e.1.c.6.e.d.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:de6c:1e41:1a4f:32ff:fef7:f8a9]) by smtp.gmail.com with ESMTPSA id s25sm4011411wmc.21.2019.08.09.07.49.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 07:49:40 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [UNSTABLE][PATCH 2/2] Ubuntu: [Config] Enable CONFIG_LOCK_DOWN_KERNEL on s390x. Date: Fri, 9 Aug 2019 15:49:29 +0100 Message-Id: <20190809144929.17651-3-xnox@ubuntu.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190809144929.17651-1-xnox@ubuntu.com> References: <20190809144929.17651-1-xnox@ubuntu.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: prudo@linux.ibm.com, Dimitri John Ledkov Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1839622 Signed-off-by: Dimitri John Ledkov --- debian.master/config/annotations | 4 ++-- debian.master/config/s390x/config.common.s390x | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 0ce63ed6d25a..1901bd1fd5c9 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -12620,8 +12620,8 @@ CONFIG_HARDENED_USERCOPY_FALLBACK policy<{'amd64': 'y', 'arm64': ' CONFIG_HARDENED_USERCOPY_PAGESPAN policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_FORTIFY_SOURCE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_STATIC_USERMODEHELPER policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> -CONFIG_LOCK_DOWN_KERNEL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'n'}> -CONFIG_LOCK_DOWN_KERNEL_FORCE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n'}> +CONFIG_LOCK_DOWN_KERNEL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}> +CONFIG_LOCK_DOWN_KERNEL_FORCE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 's390x': 'n'}> CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ policy<{'amd64': 'y', 'i386': 'y'}> CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y'}> CONFIG_LSM policy<{'amd64': '"yama,loadpin,integrity,apparmor"', 'arm64': '"yama,loadpin,integrity,apparmor"', 'armhf': '"yama,loadpin,integrity,apparmor"', 'i386': '"yama,loadpin,integrity,apparmor"', 'ppc64el': '"yama,loadpin,integrity,apparmor"', 's390x': '"yama,loadpin,integrity,apparmor"'}> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index afd13fa2a6e2..889f00e1ba24 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -268,7 +268,7 @@ CONFIG_KVM=y # CONFIG_LDM_PARTITION is not set # CONFIG_LIBNVDIMM is not set # CONFIG_LLC2 is not set -# CONFIG_LOCK_DOWN_KERNEL is not set +CONFIG_LOCK_DOWN_KERNEL=y CONFIG_LOG_BUF_SHIFT=18 # CONFIG_LPC_ICH is not set # CONFIG_LPC_SCH is not set