aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
authorVincenzo Frascino <vincenzo.frascino@arm.com>2022-09-07 13:12:30 +0100
committerJarkko Sakkinen <jarkko@kernel.org>2022-10-05 00:25:56 +0300
commit72e9be6be9c08d882f94f80c7cf1b27f0896213d (patch)
treeb819a75ef35b1237c03d306f75557bcb0088a072 /security/keys
parentchar: move from strlcpy with unused retval to strscpy (diff)
downloadlinux-dev-72e9be6be9c08d882f94f80c7cf1b27f0896213d.tar.xz
linux-dev-72e9be6be9c08d882f94f80c7cf1b27f0896213d.zip
security/keys: Remove inconsistent __user annotation
The declaration of keyring_read does not match the definition (security/keys/keyring.c). In this case the definition is correct because it matches what defined in "struct key_type::read" (linux/key-type.h). Fix the declaration removing the inconsistent __user annotation. Cc: David Howells <dhowells@redhat.com> Cc: Jarkko Sakkinen <jarkko@kernel.org> Cc: Paul Moore <paul@paul-moore.com> Cc: James Morris <jmorris@namei.org> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Reviewed-by: Paul Moore <paul@paul-moore.com> Acked-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Diffstat (limited to 'security/keys')
-rw-r--r--security/keys/keyring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 5e6a90760753..4448758f643a 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -79,7 +79,7 @@ static void keyring_revoke(struct key *keyring);
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",