diff options
| author | Slavomir Kaslev | 2018-11-16 10:27:53 +0100 |
|---|---|---|
| committer | David S. Miller | 2018-11-18 06:34:11 +0100 |
| commit | 95506588d2c1d72ca29adef8ae9bf771bcfb4ced (patch) | |
| tree | fc99cbe4f4da3a1eee2583d4b63b10010e87e6fa /net/socket.c | |
| parent | net: phy: mdio-gpio: Fix working over slow can_sleep GPIOs (diff) | |
| download | kernel-qcow2-linux-95506588d2c1d72ca29adef8ae9bf771bcfb4ced.tar.gz kernel-qcow2-linux-95506588d2c1d72ca29adef8ae9bf771bcfb4ced.tar.xz kernel-qcow2-linux-95506588d2c1d72ca29adef8ae9bf771bcfb4ced.zip | |
socket: do a generic_file_splice_read when proto_ops has no splice_read
splice(2) fails with -EINVAL when called reading on a socket with no splice_read
set in its proto_ops (such as vsock sockets). Switch this to fallbacks to a
generic_file_splice_read instead.
Signed-off-by: Slavomir Kaslev <kaslevs@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 593826e11a53..334fcc617ef2 100644 --- a/net/socket.c +++ b/net/socket.c @@ -853,7 +853,7 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, struct socket *sock = file->private_data; if (unlikely(!sock->ops->splice_read)) - return -EINVAL; + return generic_file_splice_read(file, ppos, pipe, len, flags); return sock->ops->splice_read(sock, ppos, pipe, len, flags); } |