]> xenbits.xensource.com Git - legacy/linux-2.6.18-xen.git/commitdiff
net: Fix NULL pointer deref of sock->ops->Sendpage in sock_sendpage().
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 14 Aug 2009 16:05:54 +0000 (17:05 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 14 Aug 2009 16:05:54 +0000 (17:05 +0100)
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
net/socket.c

index 6d261bf206fc83ff9aa5411a25273f53be7139d0..a4af3833bafd877d77307da2bd241fa9079cca90 100644 (file)
@@ -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,