Received-SPF: pass (google.com: domain of linux-crypto+bounces-2609-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Eric Snowberg <eric.snowberg@oracle.com>
To: linux-security-module@vger.kernel.org
Cc: dhowells@redhat.com, dwmw2@infradead.org, herbert@gondor.apana.org.au,
        davem@davemloft.net, ardb@kernel.org, jarkko@kernel.org,
        paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com,
        zohar@linux.ibm.com, roberto.sassu@huawei.com,
        dmitry.kasatkin@gmail.com, mic@digikod.net, casey@schaufler-ca.com,
        stefanb@linux.ibm.com, eric.snowberg@oracle.com,
        linux-kernel@vger.kernel.org, keyrings@vger.kernel.org,
        linux-crypto@vger.kernel.org, linux-efi@vger.kernel.org,
        linux-integrity@vger.kernel.org
Subject: [PATCH RFC 0/8] Clavis LSM
Date: Mon, 11 Mar 2024 12:11:03 -0400
Message-Id: <20240311161111.3268190-1-eric.snowberg@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?qCnAA8nL4RqCsu3Nq2cIs+oF/sGJqS5yS8RDO6Os3QofwKZ00tP7zqs1DG47?=
 =?us-ascii?Q?zjCUcMBXOrMdLle6oKJeGB7f6TgE66Lyw4sEI8pSHLw78msbuTtVY5NTnMNO?=
 =?us-ascii?Q?XvVcd7jLqSF0HWHa7EHg8d2pxOGs9J6OJ67z1d9LUBcHYqoD+cIEZRWTI7ZX?=
 =?us-ascii?Q?afhhwGiwF6vuvHByOxwZF/hv5mVdWtdZwvRwcOvjtEeteS6dF8qLD2tFy2qU?=
 =?us-ascii?Q?cnCwQpew0krgjC+aypcw3vEEQkgX4tbG76BmGN3ZIsKG42lhDKwsypxva9KV?=
 =?us-ascii?Q?PzP66b5fGxTQl39fdtLk0r7lO1F4hh2RaMi2YfVfgkNAE11073uofwFeu4/F?=
 =?us-ascii?Q?l9FUSumsvbs+IjX2KZ6RSQ5GhGsXkzozkd5M2/bPHM5Yz/YDad1K9j5Z5g4o?=
 =?us-ascii?Q?EddmtnhcagnX9NtTWHjA8/bKU5YHuEp2/t+x06o5bk31eRT/cr2V0alIVLoL?=
 =?us-ascii?Q?MlzM/uZQpA4ARdaK8h/Cikh/CI/fZAVAha9GI+NZ3GyTsON6cbGLYw2t1x7s?=
 =?us-ascii?Q?1YfMEzrGUWnh+zk+rv8SKg8f0iG0UiJHWFiIkrkwC4d5Cho4BBusO/R0uTRC?=
 =?us-ascii?Q?unRBjCCdw3BmnSctlAL4PzGq69k91eVPr7Du0yF8/w+uzGqUxC18bBQs1mjC?=
 =?us-ascii?Q?CTMq9bSOKc84feixf4XM1LmnDuCjjjgWd6LTHfAkH9YPF0i3yJePQIwGEQVI?=
 =?us-ascii?Q?EiybU3qvNqeW4dZmk2SPpC/MfhMkrBMt9W/PEFBfJ1peBgT152TsfqTu0RBT?=
 =?us-ascii?Q?rgMzxXBMjSPatlg96LTk/uxEDlz++0Ov/8tgUyYFq1RxwyiEdXaicC484KnS?=
 =?us-ascii?Q?jE5x4K1HbScWe9WCRbscNK7cd2F+xILWfIABQdHDzQul7G4nC0qruUxOPKcC?=
 =?us-ascii?Q?CTVQ9mCkoDriL4KKrhHmbwD+GRLhZrlnd1/f+GYNcz+EMYuMjyXndUupfHIp?=
 =?us-ascii?Q?WQ4RSqy09sumpp0yPXOfBfBk099bF6lB3iYD54RJmHz0TNZox6xxSm2OX8/4?=
 =?us-ascii?Q?8DufgnIrwco0bAGA5T7GvgVuNGZ88n0IuC0SSQNIvZ2VMsqdMkaRHQeIjtm2?=
 =?us-ascii?Q?Aqt11EcOIU/JCTTdR7ywUx0N2snaB+YiCbpmQ7VguTEcquSXpthlVZieQXyd?=
 =?us-ascii?Q?vTzITdRVTG9mhcC6r4TMqzf3wj0z3WAb3CtModazFfpys9J/lr5r+iJp4eAi?=
 =?us-ascii?Q?fOLR1qPsahp4ZVtgfbfqHS+PZ3eJiLyFpz2uIzBsKcwb0KhmtzD5UU0vzJnA?=
 =?us-ascii?Q?2UPaX0rUZnVANP2o0iUkkccOofSFDTo9sEXtR4O9nM+tDUC4KFd2rP7GaZCR?=
 =?us-ascii?Q?PohFay77Ec1nSQMxpWURIQP+abJfc3xFjgp6nNEtKYq8BUt5R+qoOzDkgCvF?=
 =?us-ascii?Q?plm4oIO+/fTHG1AT1EZdudJpy63EhIONohSWo3lw2dDVh38ukJy6ts7l67U4?=
 =?us-ascii?Q?eNQ1rGbctttmRQDQNbLEj5Hh/D2lMeJ4Ar1gy1CKTCAvBxYLdTMY6mf7ImyV?=
 =?us-ascii?Q?O19G7XheuiXl2i6tXcbY6jU825FEjaPejUwFu70gnYBR1bP3eD3vlfUbo9XC?=
 =?us-ascii?Q?BuOlXtm54Oa7ArEi+GFG0pwLVwq6SCDQlwe0ABc2w/XTGFgYfS956VEBh1cC?=
 =?us-ascii?Q?NE79//Tho9t80Qd+nZpl+uM=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	/3E//jkMk87K3xO62szcroogeJLyllyAvdwNaP3FjrQgMQeT8pHSQJO+lFzHHpk7qpDg6t11NF0i45IoFjSmky7+TbXx3y7YjQKTJ2+8eyC++V/cstZf5PZEDs99Oxpmgf1PqQaKfemju6mlMIKt8npP9MVgzmnKxRLe5tM0+o2yFo2UtL49SVyE9IzHY2TGXoSfm3YkVmE1zyJ0J8quWlW7DMJ6Ie7nN5iQYeDJxjS5uUkpoQ5PN9seTfVKOxqP+FEM6SZE4EZZj23qWYpN9vpY7BBKoe73Cmrm3msayuk8lt+dxDQAtPo2WVpoDRm6Ai5A64ruYuZDkArm6CcjH/bZW1iB5oF3/MEXUqEzzcJaT6Raua3360llnQJCrmNxs2n1wpZjIWBMRnsJN5x8bzqhpE+xhSIkTTs0Va2FR2IG6ZoV0/pgG58GM8CDXRxFGY+kywk3P4KzkypaAkrr5ef92ZtVzsnkkkM8tc+KwSKx1XYNZVkGmST3JpJJu6RLikGrqK30I9hcls+K0CHQwZru3WLv37KknX48riCxEPTiUQUIKW+3jk26DHb8SDmylrywEKQToa09N+DfQiHOqU6oDHFcqp/gU6w/8sYeHzQ=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 051fb2e3-c40e-48ff-8c71-08dc41e6f6c3
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4150.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2024 16:19:02.1264
 (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: 9GDp3XJilN9070autVkRJitd1TeA4QwDqQWbZQESdoXOK/4qrBhAA0654MurfEbJVQT6SCloSWuKsbhgTGo9hoD8hyWCTu3f/K9KSe+PNa4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5119
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-03-11_10,2024-03-11_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0
 mlxlogscore=999 malwarescore=0 mlxscore=0 bulkscore=0 spamscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2403110124
X-Proofpoint-ORIG-GUID: ftMaMqjLpR-_MbyRzJ4hCziGYCEt7oUE
X-Proofpoint-GUID: ftMaMqjLpR-_MbyRzJ4hCziGYCEt7oUE

Introduce a new LSM called Clavis (Latin word meaning key).  The motivation
behind this LSM is to provide access control for system keys.  Before spending
more time on this LSM, I am sending this as an RFC to start a discussion to see
if the current direction taken has a possibility of being accepted in the future.

Today the kernel has the following system keyrings: .builtin_trusted_keyring,
.secondary_trusted_keyring, and the .machine.  It also has the .platform keyring
which has limited capabilities; it can only be used to verify a kernel for kexec.

Today the kernel also tracks key usage for verification done with any of these
keys. Current verification usage includes: VERIFYING_MODULE_SIGNATURE,
VERIFYING_FIRMWARE_SIGNATURE, VERIFYING_KEXEC_PE_SIGNATURE, VERIFYING_KEY_SIGNATURE,
VERIFYING_KEY_SELF_SIGNATURE, and VERIFYING_UNSPECIFIED_SIGNATURE. After these usage
types were originally introduced, most additions have typically used the
VERIFYING_UNSPECIFIED_SIGNATURE.

At the moment, besides the usage enforcement for .platform keys, any key
contained within the system keyrings can be used for any verification
purpose.  For example, a key that was originally created to sign kernel
modules could be used for BPF verification.

This new LSM adds the ability to do access control for all system keys. When
enabled, only the .builtin_trusted_keys are available for loading kernel modules
and doing a kexec.  Until an ACL entry is added for a specific key, no other
system key may be used for any other purpose.

Enabling the LSM is done during initial boot by passing in a single asymmetric
key id within a new "clavis=" boot param. The asymmetric key id must match one
already contained within any of the system keyrings.  If a match is found, a
link is created into the new .clavis keyring.  This key shall be used as the
root of trust for any keyring ACL updates afterwards.

On UEFI systems the "clavis" boot param is mirrored into a new UEFI variable
within the EFI stub code. This variable will persist until the next power on
reset.  This same type of functionality is done within shim. Since this variable
is created before ExitBootServices (EBS) it will not have the NVRAM bit set,
signifying it was created during the Boot Services phase. This is being used
so the "clavis" boot param can not be changed via kexec, thereby preventing
a pivot of the root of trust.

As mentioned earlier, this LSM introduces a new .clavis keyring.  Following
boot, no new asymmetric keys can be added to this keyring and only the key
designated via the initial boot param may be used. This LSM can not be started
at any other point in time.  The .clavis keyring also holds the access control
list for system keys. A new key type called clavis_key_acl is being introduced.
This contains the usage followed by the asymmetric key id. To be added to the
clavis keyring, the clavis_key_acl must be S/MIME signed by the sole asymmetric
key contained within it. New ACL additions to the .clavis keyring may be added
at any time.

Currently this LSM does not require new changes or modifications to any user
space tools.  It also does not have a securityfs interface.  Everything is
done using the existing keyctl tool through the new .clavis keyring. The
S/MIME signing can be done with a simple OpenSSL command. If additions or
updates need to be added in the future, new acl key types could be created.
With this approach, maintainability should not be an issue in the future
if missing items are identified.

For setup and usage instructions, the final patch includes an admin-guide.

Future enhancements to this LSM could include:

1. Subsystems that currently use system keys with
   VERIFYING_UNSPECIFIED_SIGNATURE could be updated with their specific
   usage type.  For example, a usage type for IMA, BPF, etc could be
   added.

2. Currently, each clavis_key_acl must be individually signed.  Add the ability
   to sign multiple clavis_key_acl entries within the same file.

3. Currently, this LSM does not place key usage restrictions on the builtin
   keys for kexec and kernel module verification. This was done to prevent a
   regression that could  prevent the kernel from booting.  This could be
   changed if there was a way at compile time to pre-populate the .clavis
   keyring. This would allow the ephemeral key used to sign the kernel
   modules to be included within the .clavis keyring, allowing the kernel
   to boot.

4. UEFI Secure Boot Advanced Targeting (SBAT) support. Since
   the boot param is mirrored into UEFI before EBS is called,
   this LSM could be enhanced to not only enforce key usage,
   but also SBAT levels across kexec.

5. Having the ability to allow platform keys to be on par with
   all other system keys when using this LSM. This would be useful
   for a user that controls their entire UEFI SB DB key chain and
   doesn't want to use MOK keys.

I would appreciate any feedback on this approach. Thanks.

This series is based off lsm/dev commit commit edc6670233a3 ("cred: Use
KMEM_CACHE() instead of kmem_cache_create()")

Eric Snowberg (8):
  certs: Introduce ability to link to a system key
  clavis: Introduce a new system keyring called clavis
  efi: Make clavis boot param persist across kexec
  clavis: Prevent clavis boot param from changing during kexec
  keys: Add new verification type (VERIFYING_CLAVIS_SIGNATURE)
  keys: Add ability to track intended usage of the public key
  clavis: Introduce a new key type called clavis_key_acl
  clavis: Introduce new LSM called clavis

 Documentation/admin-guide/LSM/clavis.rst      | 190 +++++++++++
 MAINTAINERS                                   |   7 +
 certs/blacklist.c                             |   3 +
 certs/system_keyring.c                        |  29 ++
 crypto/asymmetric_keys/asymmetric_type.c      |   1 +
 crypto/asymmetric_keys/pkcs7_trust.c          |  20 ++
 crypto/asymmetric_keys/pkcs7_verify.c         |   5 +
 crypto/asymmetric_keys/signature.c            |   4 +
 drivers/firmware/efi/Kconfig                  |  12 +
 drivers/firmware/efi/libstub/Makefile         |   1 +
 drivers/firmware/efi/libstub/clavis.c         |  33 ++
 .../firmware/efi/libstub/efi-stub-helper.c    |   2 +
 drivers/firmware/efi/libstub/efi-stub.c       |   2 +
 drivers/firmware/efi/libstub/efistub.h        |   8 +
 drivers/firmware/efi/libstub/x86-stub.c       |   2 +
 include/crypto/pkcs7.h                        |   3 +
 include/crypto/public_key.h                   |   4 +
 include/keys/system_keyring.h                 |   7 +-
 include/linux/efi.h                           |   1 +
 include/linux/lsm_hook_defs.h                 |   2 +
 include/linux/security.h                      |  11 +
 include/linux/verification.h                  |   1 +
 include/uapi/linux/lsm.h                      |   1 +
 security/Kconfig                              |  11 +-
 security/Makefile                             |   1 +
 security/clavis/Kconfig                       |   9 +
 security/clavis/Makefile                      |   7 +
 security/clavis/clavis.c                      |  25 ++
 security/clavis/clavis.h                      |  16 +
 security/clavis/clavis_efi.c                  |  50 +++
 security/clavis/clavis_keyring.c              | 313 ++++++++++++++++++
 security/integrity/iint.c                     |   2 +
 security/security.c                           |  16 +-
 33 files changed, 792 insertions(+), 7 deletions(-)
 create mode 100644 Documentation/admin-guide/LSM/clavis.rst
 create mode 100644 drivers/firmware/efi/libstub/clavis.c
 create mode 100644 security/clavis/Kconfig
 create mode 100644 security/clavis/Makefile
 create mode 100644 security/clavis/clavis.c
 create mode 100644 security/clavis/clavis.h
 create mode 100644 security/clavis/clavis_efi.c
 create mode 100644 security/clavis/clavis_keyring.c


base-commit: edc6670233a333ccfd1ec0548f068bd121d209c8
-- 
2.39.3