From: Jarkko Sakkinen <jarkko@kernel.org>
To: Eric Snowberg <eric.snowberg@oracle.com>
Cc: zohar@linux.ibm.com, 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,
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: Re: [PATCH v5 5/6] KEYS: CA link restriction
Date: Sun, 12 Mar 2023 00:10:10 +0200 [thread overview]
Message-ID: <ZAz8QlynTSMD7kuE@kernel.org> (raw)
In-Reply-To: <20230302164652.83571-6-eric.snowberg@oracle.com>
On Thu, Mar 02, 2023 at 11:46:51AM -0500, Eric Snowberg wrote:
> Add a new link restriction. Restrict the addition of keys in a keyring
> based on the key to be added being a CA.
>
> Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
> Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
> ---
> crypto/asymmetric_keys/restrict.c | 38 +++++++++++++++++++++++++++++++
> include/crypto/public_key.h | 15 ++++++++++++
> 2 files changed, 53 insertions(+)
>
> diff --git a/crypto/asymmetric_keys/restrict.c b/crypto/asymmetric_keys/restrict.c
> index 6b1ac5f5896a..48457c6f33f9 100644
> --- a/crypto/asymmetric_keys/restrict.c
> +++ b/crypto/asymmetric_keys/restrict.c
> @@ -108,6 +108,44 @@ int restrict_link_by_signature(struct key *dest_keyring,
> return ret;
> }
>
> +/**
> + * restrict_link_by_ca - Restrict additions to a ring of CA keys
> + * @dest_keyring: Keyring being linked to.
> + * @type: The type of key being added.
> + * @payload: The payload of the new key.
> + * @trust_keyring: Unused.
> + *
> + * Check if the new certificate is a CA. If it is a CA, then mark the new
> + * certificate as being ok to link.
> + *
> + * Returns 0 if the new certificate was accepted, -ENOKEY if the
> + * certificate is not a CA. -ENOPKG if the signature uses unsupported
> + * crypto, or some other error if there is a matching certificate but
> + * the signature check cannot be performed.
> + */
> +int restrict_link_by_ca(struct key *dest_keyring,
> + const struct key_type *type,
> + const union key_payload *payload,
> + struct key *trust_keyring)
> +{
> + const struct public_key *pkey;
> +
> + if (type != &key_type_asymmetric)
> + return -EOPNOTSUPP;
> +
> + pkey = payload->data[asym_crypto];
> + if (!pkey)
> + return -ENOPKG;
> + if (!test_bit(KEY_EFLAG_CA, &pkey->key_eflags))
> + return -ENOKEY;
> + if (!test_bit(KEY_EFLAG_KEYCERTSIGN, &pkey->key_eflags))
> + return -ENOKEY;
> + if (test_bit(KEY_EFLAG_DIGITALSIG, &pkey->key_eflags))
> + return -ENOKEY;
nit: would be more readable, if conditions were separated by
empty lines.
> +
> + return 0;
> +}
> +
> static bool match_either_id(const struct asymmetric_key_id **pair,
> const struct asymmetric_key_id *single)
> {
> diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h
> index 03c3fb990d59..653992a6e941 100644
> --- a/include/crypto/public_key.h
> +++ b/include/crypto/public_key.h
> @@ -75,6 +75,21 @@ extern int restrict_link_by_key_or_keyring_chain(struct key *trust_keyring,
> const union key_payload *payload,
> struct key *trusted);
>
> +#if IS_REACHABLE(CONFIG_ASYMMETRIC_KEY_TYPE)
> +extern int restrict_link_by_ca(struct key *dest_keyring,
> + const struct key_type *type,
> + const union key_payload *payload,
> + struct key *trust_keyring);
> +#else
> +static inline int restrict_link_by_ca(struct key *dest_keyring,
> + const struct key_type *type,
> + const union key_payload *payload,
> + struct key *trust_keyring)
> +{
> + return 0;
> +}
> +#endif
> +
> extern int query_asymmetric_key(const struct kernel_pkey_params *,
> struct kernel_pkey_query *);
>
> --
> 2.27.0
>
BR, Jarkko
next prev parent reply other threads:[~2023-03-11 22:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 16:46 [PATCH v5 0/6] Add CA enforcement keyring restrictions Eric Snowberg
2023-03-02 16:46 ` [PATCH v5 1/6] KEYS: Create static version of public_key_verify_signature Eric Snowberg
2023-03-11 21:52 ` Jarkko Sakkinen
2023-03-02 16:46 ` [PATCH v5 2/6] KEYS: Add missing function documentation Eric Snowberg
2023-03-11 22:08 ` Jarkko Sakkinen
2023-03-02 16:46 ` [PATCH v5 3/6] KEYS: X.509: Parse Basic Constraints for CA Eric Snowberg
2023-03-02 16:46 ` [PATCH v5 4/6] KEYS: X.509: Parse Key Usage Eric Snowberg
2023-03-11 22:09 ` Jarkko Sakkinen
2023-03-02 16:46 ` [PATCH v5 5/6] KEYS: CA link restriction Eric Snowberg
2023-03-11 22:10 ` Jarkko Sakkinen [this message]
2023-03-20 17:35 ` Eric Snowberg
2023-03-20 18:28 ` Jarkko Sakkinen
2023-03-20 20:35 ` Mimi Zohar
2023-03-29 21:58 ` Jarkko Sakkinen
2023-03-29 23:27 ` Jarkko Sakkinen
2023-03-30 6:01 ` Mimi Zohar
2023-04-21 21:12 ` Jarkko Sakkinen
2023-03-02 16:46 ` [PATCH v5 6/6] integrity: machine keyring CA configuration Eric Snowberg
2023-03-13 14:26 ` Mimi Zohar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZAz8QlynTSMD7kuE@kernel.org \
--to=jarkko@kernel.org \
--cc=coxu@redhat.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=dwmw2@infradead.org \
--cc=eric.snowberg@oracle.com \
--cc=erpalmer@linux.vnet.ibm.com \
--cc=herbert@gondor.apana.org.au \
--cc=jmorris@namei.org \
--cc=kanth.ghatraju@oracle.com \
--cc=keyrings@vger.kernel.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=pvorel@suse.cz \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).