Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Eric Snowberg <eric.snowberg@oracle.com>
To:     jarkko@kernel.org, zohar@linux.ibm.com
Cc:     dhowells@redhat.com, dwmw2@infradead.org,
        herbert@gondor.apana.org.au, davem@davemloft.net,
        dmitry.kasatkin@gmail.com, paul@paul-moore.com, jmorris@namei.org,
        serge@hallyn.com, pvorel@suse.cz, noodles@fb.com, tiwai@suse.de,
        bp@suse.de, eric.snowberg@oracle.com, kanth.ghatraju@oracle.com,
        konrad.wilk@oracle.com, erpalmer@linux.vnet.ibm.com,
        coxu@redhat.com, keyrings@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org,
        linux-integrity@vger.kernel.org,
        linux-security-module@vger.kernel.org
Subject: [PATCH v2 00/10] Add CA enforcement keyring restrictions
Date:   Wed,  7 Dec 2022 12:12:28 -0500
Message-Id: <20221207171238.2945307-1-eric.snowberg@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7DXs3vMutaLB1IxKeCMeEZFxvf9oG7psyFwzxFDYGfMhA/OfyKFbUe6R0Rjy?=
 =?us-ascii?Q?H3yzX7v/cFVzPZBiEWelK1WYZ7OasB3xlt3CS3pjqr/WfRYOSfbvHpmnn3RV?=
 =?us-ascii?Q?TZnG+azpaCBiluAsTKN2HchKCoeuKTN3J4dalZn/0YYblHA8YddqSoTAZN7P?=
 =?us-ascii?Q?vspIPZMbyQkcZy7K91qtu4W4hGdF2gX5ZMKP/7P+X6cuPCE9vD+4x6wUCm9s?=
 =?us-ascii?Q?Hhqh84c8hwfXa1PIwaGafDrPgKma+psRNVTd/HfWPAwR9apZgxMrDjTRBxZC?=
 =?us-ascii?Q?lgyIoXM+3kWHRYGNJby5Rk/vtfbU5sQ8mt61PjU6vy2eJGMr4zJwaECXwc8g?=
 =?us-ascii?Q?Pn5ZF9KuThOsMoOQwQppqj/K9COWhylMf0MGeCCDYR+6cQYd8JYCYshWlBaF?=
 =?us-ascii?Q?rzXrZuESeqDrgrQlIfjqdqHktlZvGMQT7yg4dHUTz8wvb6vVrLGj5vhJsJ74?=
 =?us-ascii?Q?fk8VgGVky9OXx8G5ntryow1G3x6z7RLiR5AlZdxzUFkKRM4ZcXPOqpAsjBgd?=
 =?us-ascii?Q?9/ZSdttHkcAcWS0sulM/zSX9AMCWOtGIhbZTmqaPX56Ovn32YUHBWAPAJkUP?=
 =?us-ascii?Q?gS9DaUk3BXXZT1LF3BhsP7eabzqtXiJmTkpzkFRL1QD1EJs7Y/Yd7KBzbTYP?=
 =?us-ascii?Q?5nsa9TQYAhP6Zl5mIQNheIiwzdfLoO91HslG2TKVV/MNvrr3Mi2tf84Ckv51?=
 =?us-ascii?Q?dpiEGMeEPGte+xNijsYoYAsOcZyg5NrQEF0kVw5Ow/lYGF6FeH3TonXDfwC9?=
 =?us-ascii?Q?HJ+m12cpzeNT3H/Dxz/PVZ7MSDX0CtKoCsCTuOjB7VQdfX1aD2JvDrupw0vd?=
 =?us-ascii?Q?YBT4XrZ/T1v1K2iWQQoCfeit2ztBI1cRDKN4iO+hIMPxIWqhmQYs+CDXMOSY?=
 =?us-ascii?Q?rsYymdF3s57mzGQucosYUXWoFjig0/PMG9Vmfkc4lgcNx2vKVnL3CT8YJuYv?=
 =?us-ascii?Q?8J9I13KoRGh+/1E3E4/WYP5VBlNLTMRuiOXycRbPWmo01PMIOKLuuDhnCr7q?=
 =?us-ascii?Q?XpGWDNUiBLu/c8wlBLtPowLCy1Vzq5mksnjLAnlVcR8atauNyMU2y2A02kAC?=
 =?us-ascii?Q?gEs86C/0AZxKgwE3cf4MXsLLN/+YhlWoma7mDuApq8UqYIOKQ0WUjOw5PTYb?=
 =?us-ascii?Q?/SdPKxgal0UWHqTfRQ8Z6qEMrZ23sQ+Wnhh/D+hGSut2lCpb5nzds56+9ENv?=
 =?us-ascii?Q?rqipDp5nTk/XMeQp336qEhgBraHQQ8eyggR23c5AxVGzoe5xyqnn8r8XAgCW?=
 =?us-ascii?Q?NoJhIqPDLc2N8eW3n62O0ulrDHaXXK3s8KfeEQrJn6C4aOgw9uA1E1DSfkca?=
 =?us-ascii?Q?SglijtHPV4zxIXzGs0w9WHsdsZ3hyVHfJ4z5GEx00vWtXfM5Wcg5tthqBkCD?=
 =?us-ascii?Q?UCNgeTSDAxUuzHdncrZgnc0xosnvKgpeyuK5IxKrlAFcUxzvYC6qvJhdmGp5?=
 =?us-ascii?Q?hPlkNTsY3MuCQOGh0V2zruz6J5WxRcFfOeqMk0sEp7DFI/8Te4sibNC6BdnH?=
 =?us-ascii?Q?hHtfJEip4QQLb3i54tsoDUmxFBs26qZzB6wHQD+eUAV/Gy3izzp+XN9exYw8?=
 =?us-ascii?Q?YS/pNt0dcNfPNIhlnco+gnVfE2Q7AFnVgDAnkHbI7/gHzMBO5DC0oxpmff2N?=
 =?us-ascii?Q?EP1s703GXdhCUmSqoQOd8Ao=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f4069506-8488-40db-217b-08dad8763d5a
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4150.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2022 17:12:37.6351
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9wvvNNP4iybtqqQQeKAJQtVS/MJWO0et6oo3TMon317L79XQPUg9c4ILn23nDtnCCb3L4ZJhyuQsD72FPLwvbyZwqPoFWrLDEwUrZCiBRC0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5293
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-12-07_08,2022-12-07_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=842 suspectscore=0
 mlxscore=0 spamscore=0 adultscore=0 bulkscore=0 phishscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2210170000 definitions=main-2212070149
X-Proofpoint-GUID: f6emVa1Uaf0W91-vQySQcGinhSWT_8sc
X-Proofpoint-ORIG-GUID: f6emVa1Uaf0W91-vQySQcGinhSWT_8sc
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

Prior to the introduction of the machine keyring, most distros simply 
allowed all keys contained within the platform keyring to be used
for both kernel and module verification.  This was done by an out of
tree patch.  Some distros took it even further and loaded all these keys
into the secondary trusted keyring.  This also allowed the system owner 
to add their own key for IMA usage.

Each distro contains similar documentation on how to sign kernel modules
and enroll the key into the MOK.  The process is fairly straightforward.
With the introduction of the machine keyring, the process remains
basically the same, without the need for any out of tree patches.

The machine keyring allowed distros to eliminate the out of tree patches
for kernel module signing.  However, it falls short in allowing the end 
user to add their own keys for IMA. Currently the machine keyring can not 
be used as another trust anchor for adding keys to the ima keyring, since 
CA enforcement does not currently exist.  This would expand the current 
integrity gap. The IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY 
Kconfig states that keys may be added to the ima keyrings if the key is 
validly signed by a CA cert in the system built-in or secondary trusted 
keyring.  Currently there is not code that enforces the "validly signed" 
CA cert. Any key in the builtin or secondary keyring can be used.  Also, 
the definition of "validly signed" has never been stated, leaving this up 
to multiple interpretations. 

To allow IMA to be enabled with the machine keyring, this series introduces
enforcement of key usage in the certificate. This series also defines a 
"validly signed" CA cert and applies the same definition across all
kernel keyrings.

The machine keyring shares  similarities with both the builtin and
secondary keyrings.  Similar to the builtin, no keys may be added to the
machine keyring following boot. The secondary keyring allows user
provided keys to be added following boot; however, a previously enrolled
kernel key must vouch for the key before it may be included. The system
owner may include their own keys into the machine keyring prior to boot.
If the end-user is not the system owner, they may not add their own keys
to the machine keyring.  

The machine keyring is only populated when Secure Boot is enabled.  A
system owner has the ability to control the entire Secure Boot keychain
(PK, KEK, DB, and DBX).  The system owner can also turn Secure Boot off.
With this control, they may use insert-sys-cert to include their own key 
and re-sign their kernel and have it boot.  The system owner also has 
control to include or exclude MOK keys. This series does not try to 
interpret how a system owner has configured their machine.  If the system 
owner has taken the steps to add their own MOK keys, they will be 
included in the machine keyring and used for verification, exactly 
the same way as keys contained in the builtin and secondary keyrings.
Since the system owner has the ability to add keys before booting to
either the machine or builtin keyrings, it is viewed as inconsequential 
if the key originated from one or the other.

This series introduces two different ways to configure the machine keyring.
By default, nothing changes and all MOK keys are loaded into it.  Whenever
a "validly signed" key is found within the machine, builtin, or
secondary, a flag indicating this is stored in the public key struct.
The other option is if the new Kconfig INTEGRITY_CA_MACHINE_KEYRING is 
enabled, only "validly signed" CA certs will be loaded into the machine 
keyring. All remaining MOK keys will be loaded into the platform keyring.

A "validly signed" CA cert shall be defined as any X509 certificate that
is self signed, contains the keyCertSign key usage and has the CA bit
set to true.

With this series applied, "validly signed" CA enforcement is in place
whenever IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is enabled.
Meaning, before any key can be included into the ima keyring, it must be
vouched for by a "validly signed" CA key contained within the builtin,
secondary, or machine keyrings.

IMA allows userspace applications to be signed. The enduser may sign
their own application, however they may also want to use an application
provided by a 3rd party.  The entity building the kernel, may not be the
same entity building the userspace program.  The system owner may also
be a third entity.  If the system owner trusts the entity building the
userspace program, they will include their public key within the MOK.
This key would be used to sign the key added to the ima keyring. Not all
3rd party userspace providers have the capability to properly manage a
root CA.  Some may outsource to a different code signing provider.  Many
code signing providers use Intermediate CA certificates. Therefore, this
series also includes support for Intermediate CA certificates.  If a
"validly signed" CA can vouch for an Intermediate CA, and it contains
the keyCertSign key usage, it will also be flagged as being a "validly
signed" CA. The Intermediate CA certificates could be loaded into the
secondary keyring following boot. Afterwards, CA enforcement is
maintained for any key added to the ima keyring.

This series could be broken up into 3 different parts.  The first two
patches could be taken now.  They solve current issues that will be
triggered by the build robots.  Patches 3-8 add CA enforcement for the
ima keyring.  Patches 9-10 restrict the machine keyring to only load CA
certs into it.  Patches 9-10 require all the previous patches since
Intermediate CA enforcement is required. 

Eric Snowberg (10):
  KEYS: Create static version of public_key_verify_signature
  KEYS: Add missing function documentation
  KEYS: X.509: Parse Basic Constraints for CA
  KEYS: X.509: Parse Key Usage
  KEYS: Introduce a CA endorsed flag
  KEYS: Introduce keyring restriction that validates ca trust
  KEYS: X.509: Flag Intermediate CA certs as endorsed
  integrity: Use root of trust signature restriction
  KEYS: CA link restriction
  integrity: restrict INTEGRITY_KEYRING_MACHINE to restrict_link_by_ca

 certs/system_keyring.c                    | 30 ++++++++-
 crypto/asymmetric_keys/restrict.c         | 81 +++++++++++++++++++++++
 crypto/asymmetric_keys/x509_cert_parser.c | 31 +++++++++
 crypto/asymmetric_keys/x509_parser.h      |  2 +
 crypto/asymmetric_keys/x509_public_key.c  | 16 +++++
 include/crypto/public_key.h               | 30 +++++++++
 include/keys/system_keyring.h             | 12 +++-
 include/linux/ima.h                       | 11 +++
 include/linux/key-type.h                  |  3 +
 include/linux/key.h                       |  2 +
 security/integrity/Kconfig                | 11 ++-
 security/integrity/digsig.c               | 12 ++--
 security/integrity/ima/Kconfig            |  6 +-
 security/keys/key.c                       | 13 ++++
 14 files changed, 249 insertions(+), 11 deletions(-)


base-commit: 76dcd734eca23168cb008912c0f69ff408905235
-- 
2.27.0