From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 14 Aug 2009 16:05:54 +0000 (+0100)
Subject: net: Fix NULL pointer deref of sock->ops->Sendpage in sock_sendpage().
X-Git-Tag: xen-3.4.2~15
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=17d4f9b183071c79d5e5926eb280637f3b8b0f20;p=legacy%2Flinux-2.6.18-xen.git

net: Fix NULL pointer deref of sock->ops->Sendpage in sock_sendpage().

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/net/socket.c b/net/socket.c
index 6d261bf2..a4af3833 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -698,7 +698,10 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
 	if (more)
 		flags |= MSG_MORE;
 
-	return sock->ops->sendpage(sock, page, offset, size, flags);
+	if (sock->ops->sendpage)
+		return sock->ops->sendpage(sock, page, offset, size, flags);
+
+	return sock_no_sendpage(sock, page, offset, size, flags);
 }
 
 static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,