From 3c158a5415650f65282a39804f8ea81f06ac6bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@simphalempin.com>
Date: Fri, 15 Feb 2008 02:35:45 -0800
Subject: [PATCH] --- yaml --- r: 85665 b: refs/heads/master c:
 997b37da1515c1620692521786a74af271664eb7 h: refs/heads/master i:   85663:
 2cd5cea9467333d093cba1f4f5e16b8ee85fdf5a v: v3

---
 [refs]             | 2 +-
 trunk/net/socket.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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);
 }