diff options
Diffstat (limited to 'vserver-sources/2.3.0.36.14-r1/4411_CVE-2009-2692.patch')
| -rw-r--r-- | vserver-sources/2.3.0.36.14-r1/4411_CVE-2009-2692.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/vserver-sources/2.3.0.36.14-r1/4411_CVE-2009-2692.patch b/vserver-sources/2.3.0.36.14-r1/4411_CVE-2009-2692.patch new file mode 100644 index 0000000..1ed5c8f --- /dev/null +++ b/vserver-sources/2.3.0.36.14-r1/4411_CVE-2009-2692.patch @@ -0,0 +1,37 @@ +From: Linus Torvalds <torvalds@linux-foundation.org> +Date: Thu, 13 Aug 2009 15:28:36 +0000 (-0700) +Subject: Make sock_sendpage() use kernel_sendpage() +X-Git-Tag: v2.6.31-rc6~8 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e694958388c50148389b0e9b9e9e8945cf0f1b98 + +Make sock_sendpage() use kernel_sendpage() + +kernel_sendpage() does the proper default case handling for when the +socket doesn't have a native sendpage implementation. + +Now, arguably this might be something that we could instead solve by +just specifying that all protocols should do it themselves at the +protocol level, but we really only care about the common protocols. +Does anybody really care about sendpage on something like Appletalk? Not +likely. + +Acked-by: David S. Miller <davem@davemloft.net> +Acked-by: Julien TINNES <julien@cr0.org> +Acked-by: Tavis Ormandy <taviso@sdf.lonestar.org> +Cc: stable@kernel.org +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +--- + +diff --git a/net/socket.c b/net/socket.c +index 791d71a..6d47165 100644 +--- a/net/socket.c ++++ b/net/socket.c +@@ -736,7 +736,7 @@ 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); ++ return kernel_sendpage(sock, page, offset, size, flags); + } + + static ssize_t sock_splice_read(struct file *file, loff_t *ppos, |