[RFC,v3,08/13] clavis: Introduce new LSM called clavis

Introduce a new LSM called clavis.  The motivation behind this LSM is to
provide access control for system keys.  The access control list is
contained within a keyring call .clavis.  During boot if the clavis= boot
arg is supplied with a key id contained within any of the current system
keyrings (builtin, secondary, machine, or platform) it shall be used as
the root of trust for validating anything that is added to the ACL list.

The first restriction introduced with this LSM is the ability to enforce
key usage.  The kernel already has a notion of tracking key usage.  This
LSM adds the ability to enforce this usage based on the system owners
configuration.

Each system key may have one or more uses defined within the ACL list.
Until an entry is added to the .clavis keyring, no other system key may
be used for any other purpose.

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
---
 Documentation/admin-guide/LSM/clavis.rst      | 191 ++++++++++++++++++
 MAINTAINERS                                   |   7 +
 crypto/asymmetric_keys/signature.c            |   4 +
 include/linux/lsm_count.h                     |   8 +-
 include/linux/lsm_hook_defs.h                 |   2 +
 include/linux/security.h                      |   7 +
 include/uapi/linux/lsm.h                      |   1 +
 security/Kconfig                              |  10 +-
 security/clavis/Makefile                      |   1 +
 security/clavis/clavis.c                      |  26 +++
 security/clavis/clavis.h                      |   4 +
 security/clavis/clavis_keyring.c              |  78 ++++++-
 security/security.c                           |  13 ++
 .../selftests/lsm/lsm_list_modules_test.c     |   3 +
 14 files changed, 346 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/admin-guide/LSM/clavis.rst
 create mode 100644 security/clavis/clavis.c

On Thu, Oct 17, 2024 at 09:55:11AM -0600, Eric Snowberg wrote:
> Introduce a new LSM called clavis.  The motivation behind this LSM is to
> provide access control for system keys.  The access control list is
> contained within a keyring call .clavis.  During boot if the clavis= boot
> arg is supplied with a key id contained within any of the current system
> keyrings (builtin, secondary, machine, or platform) it shall be used as
> the root of trust for validating anything that is added to the ACL list.
> 
> The first restriction introduced with this LSM is the ability to enforce
> key usage.  The kernel already has a notion of tracking key usage.  This
> LSM adds the ability to enforce this usage based on the system owners
> configuration.
> 
> Each system key may have one or more uses defined within the ACL list.
> Until an entry is added to the .clavis keyring, no other system key may
> be used for any other purpose.
> 
> Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
> ---
>  Documentation/admin-guide/LSM/clavis.rst      | 191 ++++++++++++++++++
>  MAINTAINERS                                   |   7 +
>  crypto/asymmetric_keys/signature.c            |   4 +
>  include/linux/lsm_count.h                     |   8 +-
>  include/linux/lsm_hook_defs.h                 |   2 +
>  include/linux/security.h                      |   7 +
>  include/uapi/linux/lsm.h                      |   1 +
>  security/Kconfig                              |  10 +-
>  security/clavis/Makefile                      |   1 +
>  security/clavis/clavis.c                      |  26 +++
>  security/clavis/clavis.h                      |   4 +
>  security/clavis/clavis_keyring.c              |  78 ++++++-
>  security/security.c                           |  13 ++
>  .../selftests/lsm/lsm_list_modules_test.c     |   3 +
>  14 files changed, 346 insertions(+), 9 deletions(-)
>  create mode 100644 Documentation/admin-guide/LSM/clavis.rst
>  create mode 100644 security/clavis/clavis.c
> 
> diff --git a/Documentation/admin-guide/LSM/clavis.rst b/Documentation/admin-guide/LSM/clavis.rst
> new file mode 100644
> index 000000000000..0e924f638a86
> --- /dev/null
> +++ b/Documentation/admin-guide/LSM/clavis.rst
> @@ -0,0 +1,191 @@
> +.. SPDX-License-Identifier: GPL-2.0
> +
> +======
> +Clavis
> +======
> +
> +Clavis is a Linux Security Module that provides mandatory access control to
> +system kernel keys (i.e. builtin, secondary, machine and platform). These
> +restrictions will prohibit keys from being used for validation. Upon boot, the
> +Clavis LSM is provided a key id as a boot parameter.  This single key is then
> +used as the root of trust for any access control modifications made going
> +forward. Access control updates must be signed and validated by this key.
> +
> +Clavis has its own keyring.  All ACL updates are applied through this keyring.
> +The update must be signed by the single root of trust key.
> +
> +When enabled, all system keys are prohibited from being used until an ACL is
> +added for them.
> +
> +On UEFI platforms, the root of trust key shall survive a kexec. Trying to
> +defeat or change it from the command line is not allowed.  The original boot
> +parameter is stored in UEFI and will always be referenced following a kexec.

Does this mean someone can reboot the host, boot another OS, store a key
id in UEFI, and force the root of trust key to be one other than what
the user lists in clavis= boot argument?

Never mind!  Saw the answer in patches 10 and 11, thanks.

> +The Clavis LSM contains a system keyring call .clavis.  It contains a single

s/call/called/

> +asymmetric key that is used to validate anything added to it.  This key can
> +be added during boot and must be a preexisting system kernel key.  If the
> +``clavis=`` boot parameter is not used, any asymmetric key the user owns

Who is "the user", and precisely what does "owns' mean here?  Is it just
restating that it must be a key already in one of the builtin or secondary
or platform keyrings?

And this is done by simply loading it into the clavis keyring, right?

-serge

> On Oct 22, 2024, at 8:25 PM, sergeh@kernel.org wrote:
> 
> On Thu, Oct 17, 2024 at 09:55:11AM -0600, Eric Snowberg wrote:
>> 
>> +The Clavis LSM contains a system keyring call .clavis.  It contains a single
> 
> s/call/called/

I will change that, thanks.

>> +asymmetric key that is used to validate anything added to it.  This key can
>> +be added during boot and must be a preexisting system kernel key.  If the
>> +``clavis=`` boot parameter is not used, any asymmetric key the user owns
> 
> Who is "the user", and precisely what does "owns' mean here?  Is it just
> restating that it must be a key already in one of the builtin or secondary
> or platform keyrings?

In the case where Clavis was not provided a key id during boot, root can 
add a single public key to the .clavis keyring anytime afterwards.  This 
key does not need to be in any of the system keyrings.  Once the key is 
added, the Clavis LSM is enabled. The root user must also own the private 
key, since this is required to do the ACL signing. I will try to clarify this better 
in the documentation. 

I wouldn't expect this to be the typical way Clavis would be used. I would 
also be interested in any feedback if enabling the Clavis LSM this way 
following boot should be removed.  If this were removed, Clavis could 
only be enabled when using the boot parameter.

> And this is done by simply loading it into the clavis keyring, right?

Correct.

On Wed, Oct 23, 2024 at 07:25:21PM +0000, Eric Snowberg wrote:
> > On Oct 22, 2024, at 8:25 PM, sergeh@kernel.org wrote:
> > 
> > On Thu, Oct 17, 2024 at 09:55:11AM -0600, Eric Snowberg wrote:
> >> 
> >> +The Clavis LSM contains a system keyring call .clavis.  It contains a single
> > 
> > s/call/called/
> 
> I will change that, thanks.
> 
> >> +asymmetric key that is used to validate anything added to it.  This key can
> >> +be added during boot and must be a preexisting system kernel key.  If the
> >> +``clavis=`` boot parameter is not used, any asymmetric key the user owns
> > 
> > Who is "the user", and precisely what does "owns' mean here?  Is it just
> > restating that it must be a key already in one of the builtin or secondary
> > or platform keyrings?
> 
> In the case where Clavis was not provided a key id during boot, root can 
> add a single public key to the .clavis keyring anytime afterwards.  This 
> key does not need to be in any of the system keyrings.  Once the key is 
> added, the Clavis LSM is enabled. The root user must also own the private 
> key, since this is required to do the ACL signing. I will try to clarify this better 

Ooh, I see.  Own it as in be able to sign things with it.  Of course.  Thanks.

> in the documentation. 
> 
> I wouldn't expect this to be the typical way Clavis would be used. I would 

Right, I wasn't asking because I would want to use it that way, but
because it feels potentially dangerous :)

> also be interested in any feedback if enabling the Clavis LSM this way 
> following boot should be removed.  If this were removed, Clavis could 
> only be enabled when using the boot parameter.

Yeah I don't know enough to give good guidance here.  I do worry about
UKIs enforcing only the built-in signed kernel command line and so preventing
a user from appending their own clavis= entry.  Not knowing how this
will end up getting deployed, I'm not sure which is the more important
issue.

> > And this is done by simply loading it into the clavis keyring, right?
> 
> Correct.
>

On Thu, 2024-10-17 at 09:55 -0600, Eric Snowberg wrote:
> Introduce a new LSM called clavis.  The motivation behind this LSM is to
> provide access control for system keys.  The access control list is
> contained within a keyring call .clavis.  During boot if the clavis= boot
> arg is supplied with a key id contained within any of the current system
> keyrings (builtin, secondary, machine, or platform) it shall be used as
> the root of trust for validating anything that is added to the ACL list.
> 
> The first restriction introduced with this LSM is the ability to enforce
> key usage.  The kernel already has a notion of tracking key usage.  This
> LSM adds the ability to enforce this usage based on the system owners
> configuration.
> 
> Each system key may have one or more uses defined within the ACL list.
> Until an entry is added to the .clavis keyring, no other system key may
> be used for any other purpose.
> 
> Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
> ---
>  Documentation/admin-guide/LSM/clavis.rst      | 191 ++++++++++++++++++
>  MAINTAINERS                                   |   7 +
>  crypto/asymmetric_keys/signature.c            |   4 +
>  include/linux/lsm_count.h                     |   8 +-
>  include/linux/lsm_hook_defs.h                 |   2 +
>  include/linux/security.h                      |   7 +
>  include/uapi/linux/lsm.h                      |   1 +
>  security/Kconfig                              |  10 +-
>  security/clavis/Makefile                      |   1 +
>  security/clavis/clavis.c                      |  26 +++
>  security/clavis/clavis.h                      |   4 +
>  security/clavis/clavis_keyring.c              |  78 ++++++-
>  security/security.c                           |  13 ++
>  .../selftests/lsm/lsm_list_modules_test.c     |   3 +
>  14 files changed, 346 insertions(+), 9 deletions(-)
>  create mode 100644 Documentation/admin-guide/LSM/clavis.rst
>  create mode 100644 security/clavis/clavis.c
> 
> diff --git a/Documentation/admin-guide/LSM/clavis.rst b/Documentation/admin-guide/LSM/clavis.rst
> new file mode 100644
> index 000000000000..0e924f638a86
> --- /dev/null
> +++ b/Documentation/admin-guide/LSM/clavis.rst
> @@ -0,0 +1,191 @@
> +.. SPDX-License-Identifier: GPL-2.0
> +
> +======
> +Clavis
> +======
> +
> +Clavis is a Linux Security Module that provides mandatory access control to
> +system kernel keys (i.e. builtin, secondary, machine and platform). These
> +restrictions will prohibit keys from being used for validation. Upon boot, the
> +Clavis LSM is provided a key id as a boot parameter.  This single key is then
> +used as the root of trust for any access control modifications made going
> +forward. Access control updates must be signed and validated by this key.
> +
> +Clavis has its own keyring.  All ACL updates are applied through this keyring.
> +The update must be signed by the single root of trust key.
> +
> +When enabled, all system keys are prohibited from being used until an ACL is
> +added for them.

Until the single key has been loaded, Clavis is not enabled.  Any key on the
system trusted keyrings remains usable for any purpose.

-> When enabled, meaning the single key has been loaded onto the Clavis keyring,
all system keys are prohibited ...

Until clavis is enabled, in my opinion the defaults should be restrictive (e.g.
CONFIG_INTEGRITY_CA_MACHINE_KEYRING,
CONFIG_SECONDARY_TRUSTED_KEYRING_SIGNED_BY_BUILTIN). Once Clavis is enabled,
based on a new helper function is_clavis_enforced() we could consider relaxing
some of the existing keyring requirements (e.g. kernel modules).

Mimi

> +
> +On UEFI platforms, the root of trust key shall survive a kexec. Trying to
> +defeat or change it from the command line is not allowed.  The original boot
> +parameter is stored in UEFI and will always be referenced following a kexec.
> +
> +The Clavis LSM contains a system keyring call .clavis.  It contains a single
> +asymmetric key that is used to validate anything added to it.  This key can
> +be added during boot and must be a preexisting system kernel key.  If the
> +``clavis=`` boot parameter is not used, any asymmetric key the user owns
> +can be added to enable the LSM.
> +
> +The only user space components are OpenSSL and the keyctl utility. A new
> +key type call ``clavis_key_acl`` is used for ACL updates. Any number of signed
> +``clavis_key_acl`` entries may be added to the .clavis keyring. The
> +``clavis_key_acl`` contains the subject key identifier along with the allowed
> +usage type for the key.
> +
> +The format is as follows:
> +
> +.. code-block:: console
> +
> +  XX:YYYYYYYYYYY
> +
> +  XX - Single byte of the key type
> +	VERIFYING_MODULE_SIGNATURE            00
> +	VERIFYING_FIRMWARE_SIGNATURE          01
> +	VERIFYING_KEXEC_PE_SIGNATURE          02
> +	VERIFYING_KEY_SIGNATURE               03
> +	VERIFYING_KEY_SELF_SIGNATURE          04
> +	VERIFYING_UNSPECIFIED_SIGNATURE       05
> +  :  - ASCII colon
> +  YY - Even number of hexadecimal characters representing the key id
> +
> +The ``clavis_key_acl`` must be S/MIME signed by the sole asymmetric key contained
> +within the .clavis keyring.
> +
> +In the future if new features are added, new key types could be created.
> +
> +Usage Examples
> +==============
> +
> +How to create a signing key:
> +----------------------------
> +
> +.. code-block:: bash
> +
> +  cat <<EOF > clavis-lsm.genkey
> +  [ req ]
> +  default_bits = 4096
> +  distinguished_name = req_distinguished_name
> +  prompt = no
> +  string_mask = utf8only
> +  x509_extensions = v3_ca
> +  [ req_distinguished_name ]
> +  O = TEST
> +  CN = Clavis LSM key
> +  emailAddress = user@example.com
> +  [ v3_ca ]
> +  basicConstraints=CA:TRUE
> +  subjectKeyIdentifier=hash
> +  authorityKeyIdentifier=keyid:always,issuer
> +  keyUsage=digitalSignature
> +  EOF
> +
> +  openssl req -new -x509 -utf8 -sha256 -days 3650 -batch \
> +        -config clavis-lsm.genkey -outform DER \
> +        -out clavis-lsm.x509 -keyout clavis-lsm.priv
> +
> +How to get the Subject Key Identifier
> +-------------------------------------
> +
> +.. code-block:: bash
> +
> +  openssl x509 -in ./clavis-lsm.x509 -inform der \
> +        -ext subjectKeyIdentifier  -nocert \
> +        | tail -n +2 | cut -f2 -d '='| tr -d ':'
> +  4a00ab9f35c9dc3aed7c225d22bafcbd9285e1e8
> +
> +How to enroll the signing key into the MOK
> +------------------------------------------
> +
> +The key must now be added to the machine or platform keyrings.  This
> +indicates the key was added by the system owner. For kernels booted through
> +shim, a first-stage UEFI boot loader, a key may be added to the machine keyring
> +by doing:
> +
> +.. code-block:: bash
> +
> +  mokutil --import ./clavis-lsm.x509
> +
> +and then rebooting and enrolling the key through MokManager.
> +
> +How to enable the Clavis LSM
> +----------------------------
> +
> +Add the key id to the ``clavis=`` boot parameter.  With the example above the
> +key id is the subject key identifier: 4a00ab9f35c9dc3aed7c225d22bafcbd9285e1e8
> +
> +Add the following boot parameter:
> +
> +.. code-block:: console
> +
> +  clavis=4a00ab9f35c9dc3aed7c225d22bafcbd9285e1e8
> +
> +After booting there will be a single key contained in the .clavis keyring:
> +
> +.. code-block:: bash
> +
> +  keyctl show %:.clavis
> +  Keyring
> +    254954913 ----swrv      0     0  keyring: .clavis
> +    301905375 ---lswrv      0     0   \_ asymmetric: TEST: Clavis LSM key: 4a00ab9f35c9dc3aed7c225d22bafcbd9285e1e8
> +
> +The original ``clavis=`` boot parameter will persist across any kexec. Changing it or
> +removing it has no effect.
> +
> +
> +How to sign an entry to be added to the .clavis keyring:
> +--------------------------------------------------------
> +
> +In this example we have 3 keys in the machine keyring.  Our Clavis LSM key, a
> +key we want to use for kernel verification and a key we want to use for module
> +verification.
> +
> +.. code-block:: bash
> +
> +  keyctl show %:.machine
> +  Keyring
> +    999488265 ---lswrv      0     0  keyring: .machine
> +    912608009 ---lswrv      0     0   \_ asymmetric: TEST: Module Key: 17eb8c5bf766364be094c577625213700add9471
> +    646229664 ---lswrv      0     0   \_ asymmetric: TEST: Kernel Key: b360d113c848ace3f1e6a80060b43d1206f0487d
> +   1073737099 ---lswrv      0     0   \_ asymmetric: TEST: Clavis LSM key: 4a00ab9f35c9dc3aed7c225d22bafcbd9285e1e8
> +
> +To update the .clavis kerying ACL list, first create a file containing the
> +key usage type followed by a colon and the key id that we want to allow to
> +validate that usage.  In the first example we are saying key
> +17eb8c5bf766364be094c577625213700add9471 is allowed to validate kernel modules.
> +In the second example we are saying key b360d113c848ace3f1e6a80060b43d1206f0487d
> +is allowed to validate signed kernels.
> +
> +.. code-block:: bash
> +
> +  echo "00:17eb8c5bf766364be094c577625213700add9471" > module-acl.txt
> +  echo "02:b360d113c848ace3f1e6a80060b43d1206f0487d" > kernel-acl.txt
> +
> +Now both these files must be signed by the key contained in the .clavis keyring:
> +
> +.. code-block:: bash
> +
> +  openssl smime -sign -signer clavis-lsm.x509 -inkey clavis-lsm.priv -in module-acl.txt \
> +        -out module-acl.pkcs7 -binary -outform DER -nodetach -noattr
> +
> +  openssl smime -sign -signer clavis-lsm.x509 -inkey clavis-lsm.priv -in kernel-acl.txt \
> +        -out kernel-acl.pkcs7 -binary -outform DER -nodetach -noattr
> +
> +Afterwards the ACL list in the clavis keyring can be updated:
> +
> +.. code-block:: bash
> +
> +  keyctl padd clavis_key_acl "" %:.clavis < module-acl.pkcs7
> +  keyctl padd clavis_key_acl "" %:.clavis < kernel-acl.pkcs7
> +
> +  keyctl show %:.clavis
> +
> +  Keyring
> +    254954913 ----swrv      0     0  keyring: .clavis
> +    301905375 ---lswrv      0     0   \_ asymmetric: TEST: Clavis LSM key: 4a00ab9f35c9dc3aed7c225d22bafcbd9285e1e8
> +   1013065475 --alswrv      0     0   \_ clavis_key_acl: 02:b360d113c848ace3f1e6a80060b43d1206f0487d
> +    445581284 --alswrv      0     0   \_ clavis_key_acl: 00:17eb8c5bf766364be094c577625213700add9471
> +
> +Now the 17eb8c5bf766364be094c577625213700add9471 key can be used for
> +validating kernel modules and the b360d113c848ace3f1e6a80060b43d1206f0487d
> +key can be used to validate signed kernels.
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7ad507f49324..748ba3f1143e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5567,6 +5567,13 @@ F:	scripts/Makefile.clang
>  F:	scripts/clang-tools/
>  K:	\b(?i:clang|llvm)\b
>  
> +CLAVIS LINUX SECURITY MODULE
> +M:	Eric Snowberg <eric.snowberg@oracle.com>
> +L:	linux-security-module@vger.kernel.org
> +S:	Maintained
> +F:	Documentation/admin-guide/LSM/clavis.rst
> +F:	security/clavis
> +
>  CLK API
>  M:	Russell King <linux@armlinux.org.uk>
>  L:	linux-clk@vger.kernel.org
> diff --git a/crypto/asymmetric_keys/signature.c b/crypto/asymmetric_keys/signature.c
> index 2deff81f8af5..7e3a78650a93 100644
> --- a/crypto/asymmetric_keys/signature.c
> +++ b/crypto/asymmetric_keys/signature.c
> @@ -13,6 +13,7 @@
>  #include <linux/err.h>
>  #include <linux/slab.h>
>  #include <linux/keyctl.h>
> +#include <linux/security.h>
>  #include <crypto/public_key.h>
>  #include <keys/user-type.h>
>  #include "asymmetric_keys.h"
> @@ -153,6 +154,9 @@ int verify_signature(const struct key *key,
>  
>  	ret = subtype->verify_signature(key, sig);
>  
> +	if (!ret)
> +		ret = security_key_verify_signature(key, sig);
> +
>  	pr_devel("<==%s() = %d\n", __func__, ret);
>  	return ret;
>  }
> diff --git a/include/linux/lsm_count.h b/include/linux/lsm_count.h
> index 16eb49761b25..146aba3993d9 100644
> --- a/include/linux/lsm_count.h
> +++ b/include/linux/lsm_count.h
> @@ -102,6 +102,11 @@
>  #define IPE_ENABLED
>  #endif
>  
> +#if IS_ENABLED(CONFIG_SECURITY_CLAVIS)
> +#define CLAVIS_ENABLED 1,
> +#else
> +#define CLAVIS_ENABLED
> +#endif
>  /*
>   *  There is a trailing comma that we need to be accounted for. This is done by
>   *  using a skipped argument in __COUNT_LSMS
> @@ -124,7 +129,8 @@
>  		LANDLOCK_ENABLED	\
>  		IMA_ENABLED		\
>  		EVM_ENABLED		\
> -		IPE_ENABLED)
> +		IPE_ENABLED		\
> +		CLAVIS_ENABLED)
>  
>  #else
>  
> diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
> index 9eca013aa5e1..a405122a4657 100644
> --- a/include/linux/lsm_hook_defs.h
> +++ b/include/linux/lsm_hook_defs.h
> @@ -410,6 +410,8 @@ LSM_HOOK(int, 0, key_getsecurity, struct key *key, char **buffer)
>  LSM_HOOK(void, LSM_RET_VOID, key_post_create_or_update, struct key *keyring,
>  	 struct key *key, const void *payload, size_t payload_len,
>  	 unsigned long flags, bool create)
> +LSM_HOOK(int, 0, key_verify_signature, const struct key *key,
> +	 const struct public_key_signature *sig)
>  #endif /* CONFIG_KEYS */
>  
>  #ifdef CONFIG_AUDIT
> diff --git a/include/linux/security.h b/include/linux/security.h
> index 2ec8f3014757..4439be172a51 100644
> --- a/include/linux/security.h
> +++ b/include/linux/security.h
> @@ -63,6 +63,7 @@ enum fs_value_type;
>  struct watch;
>  struct watch_notification;
>  struct lsm_ctx;
> +struct public_key_signature;
>  
>  /* Default (no) options for the capable function */
>  #define CAP_OPT_NONE 0x0
> @@ -2053,6 +2054,7 @@ void security_key_post_create_or_update(struct key *keyring, struct key *key,
>  					const void *payload, size_t payload_len,
>  					unsigned long flags, bool create);
>  
> +int security_key_verify_signature(const struct key *key, const struct public_key_signature *sig);
>  #else
>  
>  static inline int security_key_alloc(struct key *key,
> @@ -2087,6 +2089,11 @@ static inline void security_key_post_create_or_update(struct key *keyring,
>  						      bool create)
>  { }
>  
> +static inline int security_key_verify_signature(const struct key *key,
> +						const struct public_key_signature *sig)
> +{
> +	return 0;
> +}
>  #endif
>  #endif /* CONFIG_KEYS */
>  
> diff --git a/include/uapi/linux/lsm.h b/include/uapi/linux/lsm.h
> index 938593dfd5da..a2ef13c71143 100644
> --- a/include/uapi/linux/lsm.h
> +++ b/include/uapi/linux/lsm.h
> @@ -65,6 +65,7 @@ struct lsm_ctx {
>  #define LSM_ID_IMA		111
>  #define LSM_ID_EVM		112
>  #define LSM_ID_IPE		113
> +#define LSM_ID_CLAVIS		114
>  
>  /*
>   * LSM_ATTR_XXX definitions identify different LSM attributes
> diff --git a/security/Kconfig b/security/Kconfig
> index 714ec08dda96..90355ddec5c0 100644
> --- a/security/Kconfig
> +++ b/security/Kconfig
> @@ -265,11 +265,11 @@ endchoice
>  
>  config LSM
>  	string "Ordered list of enabled LSMs"
> -	default "landlock,lockdown,yama,loadpin,safesetid,smack,selinux,tomoyo,apparmor,ipe,bpf" if DEFAULT_SECURITY_SMACK
> -	default "landlock,lockdown,yama,loadpin,safesetid,apparmor,selinux,smack,tomoyo,ipe,bpf" if DEFAULT_SECURITY_APPARMOR
> -	default "landlock,lockdown,yama,loadpin,safesetid,tomoyo,ipe,bpf" if DEFAULT_SECURITY_TOMOYO
> -	default "landlock,lockdown,yama,loadpin,safesetid,ipe,bpf" if DEFAULT_SECURITY_DAC
> -	default "landlock,lockdown,yama,loadpin,safesetid,selinux,smack,tomoyo,apparmor,ipe,bpf"
> +	default "landlock,lockdown,yama,loadpin,safesetid,smack,selinux,tomoyo,apparmor,ipe,bpf,clavis" if DEFAULT_SECURITY_SMACK
> +	default "landlock,lockdown,yama,loadpin,safesetid,apparmor,selinux,smack,tomoyo,ipe,bpf,clavis" if DEFAULT_SECURITY_APPARMOR
> +	default "landlock,lockdown,yama,loadpin,safesetid,tomoyo,ipe,bpf,clavis" if DEFAULT_SECURITY_TOMOYO
> +	default "landlock,lockdown,yama,loadpin,safesetid,ipe,bpf,clavis" if DEFAULT_SECURITY_DAC
> +	default "landlock,lockdown,yama,loadpin,safesetid,selinux,smack,tomoyo,apparmor,ipe,bpf,clavis"
>  	help
>  	  A comma-separated list of LSMs, in initialization order.
>  	  Any LSMs left off this list, except for those with order
> diff --git a/security/clavis/Makefile b/security/clavis/Makefile
> index 16c451f45f37..a3430dd6bdf9 100644
> --- a/security/clavis/Makefile
> +++ b/security/clavis/Makefile
> @@ -1,3 +1,4 @@
>  # SPDX-License-Identifier: GPL-2.0
>  
>  obj-$(CONFIG_SECURITY_CLAVIS) += clavis_keyring.o
> +obj-$(CONFIG_SECURITY_CLAVIS) += clavis.o
> diff --git a/security/clavis/clavis.c b/security/clavis/clavis.c
> new file mode 100644
> index 000000000000..21ade9e625dc
> --- /dev/null
> +++ b/security/clavis/clavis.c
> @@ -0,0 +1,26 @@
> +// SPDX-License-Identifier: GPL-2.0
> +//
> +#include <linux/lsm_hooks.h>
> +#include <uapi/linux/lsm.h>
> +#include "clavis.h"
> +
> +static struct security_hook_list clavis_hooks[] __ro_after_init = {
> +	LSM_HOOK_INIT(key_verify_signature, clavis_sig_verify),
> +};
> +
> +const struct lsm_id clavis_lsmid = {
> +	.name = "clavis",
> +	.id = LSM_ID_CLAVIS,
> +};
> +
> +static int __init clavis_lsm_init(void)
> +{
> +	clavis_keyring_init();
> +	security_add_hooks(clavis_hooks, ARRAY_SIZE(clavis_hooks), &clavis_lsmid);
> +	return 0;
> +};
> +
> +DEFINE_LSM(clavis) = {
> +	.name = "clavis",
> +	.init = clavis_lsm_init,
> +};
> diff --git a/security/clavis/clavis.h b/security/clavis/clavis.h
> index 92f77a1939ad..b77e4ec8edbe 100644
> --- a/security/clavis/clavis.h
> +++ b/security/clavis/clavis.h
> @@ -3,6 +3,8 @@
>  #define _SECURITY_CLAVIS_H_
>  #include <keys/asymmetric-type.h>
>  
> +struct public_key_signature;
> +
>  /* Max length for the asymmetric key id contained on the boot param */
>  #define CLAVIS_BIN_KID_MAX   32
>  #define CLAVIS_ASCII_KID_MAX 64
> @@ -20,4 +22,6 @@ const char __initconst *const clavis_module_acl[] = {
>  extern const char __initconst *const clavis_module_acl[];
>  #endif
>  
> +int __init clavis_keyring_init(void);
> +int clavis_sig_verify(const struct key *key, const struct public_key_signature *sig);
>  #endif /* _SECURITY_CLAVIS_H_ */
> diff --git a/security/clavis/clavis_keyring.c b/security/clavis/clavis_keyring.c
> index 2a18d0e77189..1e1fbb54f6be 100644
> --- a/security/clavis/clavis_keyring.c
> +++ b/security/clavis/clavis_keyring.c
> @@ -284,7 +284,7 @@ static void clavis_add_acl(const char *const *skid_list, struct key *keyring)
>  	}
>  }
>  
> -static int __init clavis_keyring_init(void)
> +int __init clavis_keyring_init(void)
>  {
>  	struct key_restriction *restriction;
>  
> @@ -306,10 +306,82 @@ static int __init clavis_keyring_init(void)
>  
>  void __init late_init_clavis_setup(void)
>  {
> -	clavis_keyring_init();
> -
>  	if (!clavis_boot_akid)
>  		return;
>  
>  	system_key_link(clavis_keyring, clavis_boot_akid);
>  }
> +
> +int clavis_sig_verify(const struct key *key, const struct public_key_signature *sig)
> +{
> +	const struct asymmetric_key_ids *kids = asymmetric_key_ids(key);
> +	const struct asymmetric_key_subtype *subtype;
> +	const struct asymmetric_key_id *newkid;
> +	char *buf_ptr, *ptr;
> +	key_ref_t ref;
> +	int i, buf_len;
> +
> +	if (!clavis_acl_enforced())
> +		return 0;
> +	if (key->type != &key_type_asymmetric)
> +		return -EKEYREJECTED;
> +	subtype = asymmetric_key_subtype(key);
> +	if (!subtype || !key->payload.data[0])
> +		return -EKEYREJECTED;
> +	if (!subtype->verify_signature)
> +		return -EKEYREJECTED;
> +
> +	/* Allow sig validation when not using a system keyring */
> +	if (!test_bit(PKS_USAGE_SET, &sig->usage_flags))
> +		return 0;
> +
> +	/* The previous sig validation is enough to get on the clavis keyring */
> +	if (sig->usage == VERIFYING_CLAVIS_SIGNATURE)
> +		return 0;
> +
> +	if (test_bit(PKS_REVOCATION_PASS, &sig->usage_flags))
> +		return 0;
> +
> +	for (i = 0, buf_len = 0; i < 3; i++) {
> +		if (kids->id[i]) {
> +			newkid = (struct asymmetric_key_id *)kids->id[i];
> +			if (newkid->len > buf_len)
> +				buf_len = newkid->len;
> +		}
> +	}
> +
> +	if (!buf_len)
> +		return -EKEYREJECTED;
> +
> +	/* Allocate enough space for the conversion to ascii plus the header. */
> +	buf_ptr = kmalloc(buf_len * 2 + 4, GFP_KERNEL | __GFP_ZERO);
> +
> +	if (!buf_ptr)
> +		return -ENOMEM;
> +
> +	for (i = 0; i < 3; i++) {
> +		if (kids->id[i]) {
> +			newkid = (struct asymmetric_key_id *)kids->id[i];
> +			if (!newkid->len)
> +				continue;
> +
> +			ptr = buf_ptr;
> +			ptr = bin2hex(ptr, &sig->usage, 1);
> +			*ptr++ = ':';
> +			ptr = bin2hex(ptr, newkid->data, newkid->len);
> +			*ptr = 0;
> +			ref = keyring_search(make_key_ref(clavis_keyring_get(), true),
> +					     &clavis_key_acl, buf_ptr, false);
> +
> +			if (!IS_ERR(ref))
> +				break;
> +		}
> +	}
> +
> +	kfree(buf_ptr);
> +
> +	if (IS_ERR(ref))
> +		return -EKEYREJECTED;
> +
> +	return 0;
> +}
> diff --git a/security/security.c b/security/security.c
> index c5981e558bc2..097f8cedcd36 100644
> --- a/security/security.c
> +++ b/security/security.c
> @@ -5522,6 +5522,19 @@ void security_key_post_create_or_update(struct key *keyring, struct key *key,
>  	call_void_hook(key_post_create_or_update, keyring, key, payload,
>  		       payload_len, flags, create);
>  }
> +
> +/**
> + * security_key_verify_signature - verify signature
> + * @key: key
> + * @sig: signature
> + *
> + * See whether signature verification is allowed based on the ACL for
> + * key usage.
> + */
> +int security_key_verify_signature(const struct key *key, const struct public_key_signature *sig)
> +{
> +	return call_int_hook(key_verify_signature, key, sig);
> +}
>  #endif	/* CONFIG_KEYS */
>  
>  #ifdef CONFIG_AUDIT
> diff --git a/tools/testing/selftests/lsm/lsm_list_modules_test.c b/tools/testing/selftests/lsm/lsm_list_modules_test.c
> index 1cc8a977c711..cf292f976ac4 100644
> --- a/tools/testing/selftests/lsm/lsm_list_modules_test.c
> +++ b/tools/testing/selftests/lsm/lsm_list_modules_test.c
> @@ -131,6 +131,9 @@ TEST(correct_lsm_list_modules)
>  		case LSM_ID_IPE:
>  			name = "ipe";
>  			break;
> +		case LSM_ID_CLAVIS:
> +			name = "clavis";
> +			break;
>  		default:
>  			name = "INVALID";
>  			break;