summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2022-05-19 17:31:37 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-25 11:49:12 +0200
commitbbb72c453c51b0822d803ea51a829dbad1b4ae88 (patch)
tree2e9c44922c93b871226a6168966d34e28f30bf41 /drivers/char
parent1923d9a8a08684c063da049fa9d5d8139edbbcbb (diff)
downloadlinux-stable-bbb72c453c51b0822d803ea51a829dbad1b4ae88.tar.gz
linux-stable-bbb72c453c51b0822d803ea51a829dbad1b4ae88.tar.bz2
linux-stable-bbb72c453c51b0822d803ea51a829dbad1b4ae88.zip
random: wire up fops->splice_{read,write}_iter()
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/random.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 807a50407b16..3b4e74d8b8d9 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -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,
};