On Thu, Mar 02, 2023 at 11:46:48AM -0500, Eric Snowberg wrote:
> Compiling with 'W=1' results in warnings that 'Function parameter or member
> not described'
>
> Add the missing parameters for
> restrict_link_by_builtin_and_secondary_trusted and
> restrict_link_to_builtin_trusted.
>
> Use /* instead of /** for get_builtin_and_secondary_restriction, since
> it is a static function.
>
> Fix wrong function name restrict_link_to_builtin_trusted.
>
> Fixes: d3bfe84129f6 ("certs: Add a secondary system keyring that can be added to dynamically")
> Signed-off-by: Eric Snowberg <eric.snowberg@xxxxxxxxxx>
> Reviewed-by: Petr Vorel <pvorel@xxxxxxx>
> Reviewed-by: Mimi Zohar <zohar@xxxxxxxxxxxxx>
> Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
> ---
> certs/system_keyring.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/certs/system_keyring.c b/certs/system_keyring.c
> index 5042cc54fa5e..a7a49b17ceb1 100644
> --- a/certs/system_keyring.c
> +++ b/certs/system_keyring.c
> @@ -33,7 +33,11 @@ extern __initconst const unsigned long system_certificate_list_size;
> extern __initconst const unsigned long module_cert_size;
>
> /**
> - * restrict_link_to_builtin_trusted - Restrict keyring addition by built in CA
> + * restrict_link_by_builtin_trusted - Restrict keyring addition by built-in CA
> + * @dest_keyring: Keyring being linked to.
> + * @type: The type of key being added.
> + * @payload: The payload of the new key.
> + * @restriction_key: A ring of keys that can be used to vouch for the new cert.
> *
> * Restrict the addition of keys into a keyring based on the key-to-be-added
> * being vouched for by a key in the built in system keyring.
> @@ -50,7 +54,11 @@ int restrict_link_by_builtin_trusted(struct key *dest_keyring,
> #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
> /**
> * restrict_link_by_builtin_and_secondary_trusted - Restrict keyring
> - * addition by both builtin and secondary keyrings
> + * addition by both built-in and secondary keyrings.
> + * @dest_keyring: Keyring being linked to.
> + * @type: The type of key being added.
> + * @payload: The payload of the new key.
> + * @restrict_key: A ring of keys that can be used to vouch for the new cert.
> *
> * Restrict the addition of keys into a keyring based on the key-to-be-added
> * being vouched for by a key in either the built-in or the secondary system
> @@ -75,7 +83,7 @@ int restrict_link_by_builtin_and_secondary_trusted(
> secondary_trusted_keys);
> }
>
> -/**
> +/*
> * Allocate a struct key_restriction for the "builtin and secondary trust"
> * keyring. Only for use in system_trusted_keyring_init().
> */
> --
> 2.27.0
>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxx>
BR, Jarkko
