]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
random: wire up fops->splice_{read,write}_iter()
authorJens Axboe <axboe@kernel.dk>
Thu, 19 May 2022 23:31:37 +0000 (17:31 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 Jun 2022 09:49:12 +0000 (11:49 +0200)
commit 79025e727a846be6fd215ae9cdb654368ac3f9a6 upstream.

Now that random/urandom is using {read,write}_iter, we can wire it up to
using the generic splice handlers.

Fixes: 36e2c7421f02 ("fs: don't allow splice read/write without explicit ops")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
[Jason: added the splice_write path. Note that sendfile() and such still
 does not work for read, though it does for write, because of a file
 type restriction in splice_direct_to_actor(), which I'll address
 separately.]
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/random.c

index 807a50407b1651cbba6c47fe541dc2d599f0dcc1..3b4e74d8b8d9707a14209642dff36a2beb16f681 100644 (file)
@@ -1381,6 +1381,8 @@ const struct file_operations random_fops = {
        .unlocked_ioctl = random_ioctl,
        .fasync = random_fasync,
        .llseek = noop_llseek,
+       .splice_read = generic_file_splice_read,
+       .splice_write = iter_file_splice_write,
 };
 
 const struct file_operations urandom_fops = {
@@ -1389,6 +1391,8 @@ const struct file_operations urandom_fops = {
        .unlocked_ioctl = random_ioctl,
        .fasync = random_fasync,
        .llseek = noop_llseek,
+       .splice_read = generic_file_splice_read,
+       .splice_write = iter_file_splice_write,
 };