Re: [PATCH v2] keys: remove __user annotation from function prototype

From: Jarkko Sakkinen
Date: Thu Apr 14 2022 - 08:06:48 EST


On Tue, Apr 05, 2022 at 06:44:53PM -0700, Randy Dunlap wrote:
> Remove a missed __user annotation from the prototype for
> keyring_read(). This cures a sparse warning when it complains about
> the difference in the prototype and the function definition.
>
> security/keys/keyring.c:481:13: sparse: long static [signed] [toplevel] keyring_read( ... )
> security/keys/keyring.c:81:13: sparse: long static [addressable] [signed] [toplevel] keyring_read( ... )
>
> Fixes: 796e46f9e2cb ("keys: Remove outdated __user annotations").
> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Cc: Jann Horn <jannh@xxxxxxxxxx>
> Cc: David Howells <dhowells@xxxxxxxxxx>
> Cc: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
> Cc: keyrings@xxxxxxxxxxxxxxx
> Cc: James Morris <jmorris@xxxxxxxxx>
> Cc: "Serge E. Hallyn" <serge@xxxxxxxxxx>
> Cc: linux-security-module@xxxxxxxxxxxxxxx
> ---
> v2: rebase/resend; add more Cc:s
>
> security/keys/keyring.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/security/keys/keyring.c
> +++ b/security/keys/keyring.c
> @@ -79,7 +79,7 @@ static void keyring_revoke(struct key *k
> static void keyring_destroy(struct key *keyring);
> static void keyring_describe(const struct key *keyring, struct seq_file *m);
> static long keyring_read(const struct key *keyring,
> - char __user *buffer, size_t buflen);
> + char *buffer, size_t buflen);
>
> struct key_type key_type_keyring = {
> .name = "keyring",

Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>

David, can you pick this?

BR, Jarkko