---

yaml --- r: 85665 b: refs/heads/master c: 997b37d h: refs/heads/master i: 85663: 2cd5cea v: v3
git-mirror · Feb 15, 2008 · 3c158a5 · 3c158a5
1 parent 64362b5
commit 3c158a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);
 }