[Xen-changelog] [linux-2.6.18-xen] net: Fix NULL pointer deref of sock->ops->Sendpage in sock_sendpage().

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1250265954 -3600
# Node ID 74e670203038a774f85c31b04c8e0e0fecbef60d
# Parent  829e4ede647c69f016fbd8e16690004e892bb702
net: Fix NULL pointer deref of sock->ops->Sendpage in sock_sendpage().

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 net/socket.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff -r 829e4ede647c -r 74e670203038 net/socket.c
--- a/net/socket.c      Fri Aug 14 10:54:33 2009 +0100
+++ b/net/socket.c      Fri Aug 14 17:05:54 2009 +0100
@@ -698,7 +698,10 @@ static ssize_t sock_sendpage(struct file
        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,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog