Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

keys: Remove outdated __user annotations

When the semantics of the ->read() handlers were changed such that "buffer"
is a kernel pointer, some __user annotations survived.
Since they're wrong now, get rid of them.

Fixes: d3ec10aa9581 ("KEYS: Don't write out to userspace while holding key semaphore")
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Ben Boeckel <mathstuf@gmail.com>

authored by

Jann Horn and committed by
David Howells
796e46f9 634c21bb

+3 -3
+3 -3
security/keys/keyring.c
··· 452 452 struct keyring_read_iterator_context { 453 453 size_t buflen; 454 454 size_t count; 455 - key_serial_t __user *buffer; 455 + key_serial_t *buffer; 456 456 }; 457 457 458 458 static int keyring_read_iterator(const void *object, void *data) ··· 479 479 * times. 480 480 */ 481 481 static long keyring_read(const struct key *keyring, 482 - char __user *buffer, size_t buflen) 482 + char *buffer, size_t buflen) 483 483 { 484 484 struct keyring_read_iterator_context ctx; 485 485 long ret; ··· 491 491 492 492 /* Copy as many key IDs as fit into the buffer */ 493 493 if (buffer && buflen) { 494 - ctx.buffer = (key_serial_t __user *)buffer; 494 + ctx.buffer = (key_serial_t *)buffer; 495 495 ctx.buflen = buflen; 496 496 ctx.count = 0; 497 497 ret = assoc_array_iterate(&keyring->keys,