Subject: Re: [vserver] Debian kernel - security update?
From: Roman Vesely <roman@liten.cz>
Date: Mon, 17 Aug 2009 21:45:20 +0200

On Mon, 17 Aug 2009 19:49:05 +0100
ben@bristolwireless.net wrote:

> > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e694958388c50148389b0e9b9e9e8945cf0f1b98
> 
> I get a problem when patching with this:
> 
> Hunk #1 FAILED at 736.
> 1 out of 1 hunk FAILED -- saving rejects to file net/socket.c.rej
> 
> If anyone can tell me how to fix this please do.

Try this patch: (against linux-source-2.6.29.6-vs2.3.0.36.14-beng)


--- socket.c    2009-08-08 20:40:35.000000000 +0200
+++ socket.c-ok 2009-08-17 21:41:09.250078057 +0200
@@ -724,7 +724,7 @@
        if (more)
                flags |= MSG_MORE;
 
-       return sock->ops->sendpage(sock, page, offset, size, flags);
+       return kernel_sendpage(sock, page, offset, size, flags);
 }
 
 static ssize_t sock_splice_read(struct file *file, loff_t *ppos,


Roman