security/keys/keyring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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@infradead.org>
Cc: Jann Horn <jannh@google.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Cc: keyrings@vger.kernel.org
---
security/keys/keyring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20220121.orig/security/keys/keyring.c
+++ linux-next-20220121/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",
ping.
On 1/22/22 12:15, 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@infradead.org>
> Cc: Jann Horn <jannh@google.com>
> Cc: David Howells <dhowells@redhat.com>
> Cc: Jarkko Sakkinen <jarkko@kernel.org>
> Cc: keyrings@vger.kernel.org
> ---
> security/keys/keyring.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-next-20220121.orig/security/keys/keyring.c
> +++ linux-next-20220121/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",
--
~Randy
© 2016 - 2026 Red Hat, Inc.