packages: kernel/kernel-CVE-2009-2692.patch (NEW) - new

[adamg]

Author: adamg                        Date: Mon Aug 17 12:12:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new

---- Files affected:
packages/kernel:
   kernel-CVE-2009-2692.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kernel/kernel-CVE-2009-2692.patch
diff -u /dev/null packages/kernel/kernel-CVE-2009-2692.patch:1.1
--- /dev/null	Mon Aug 17 14:12:10 2009
+++ packages/kernel/kernel-CVE-2009-2692.patch	Mon Aug 17 14:12:05 2009
@@ -0,0 +1,37 @@
+From: Linus Torvalds <torvalds at 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 at davemloft.net>
+Acked-by: Julien TINNES <julien at cr0.org>
+Acked-by: Tavis Ormandy <taviso at sdf.lonestar.org>
+Cc: stable at kernel.org
+Signed-off-by: Linus Torvalds <torvalds at 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,
================================================================