diff --git a/[refs] b/[refs] index 9f0bc7cb32cf..fc8828db2706 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69c3683ca7fe066ecba9e8a0424c5abd258a5d58 +refs/heads/master: 997b37da1515c1620692521786a74af271664eb7 diff --git a/trunk/net/socket.c b/trunk/net/socket.c index 7651de008502..b6d35cd72a50 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -701,6 +701,9 @@ 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 sock->ops->splice_read(sock, ppos, pipe, len, flags); }