[kernel] r14121 - in dists/lenny/linux-2.6: . debian debian/patches/bugfix/all debian/patches/series

[Dann Frazier]

Author: dannf
Date: Sun Aug 16 19:38:32 2009
New Revision: 14121

Log:
merge 2.6.26-17lenny2

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/make-sock_sendpage-use-kernel_sendpage.patch
      - copied unchanged from r14120, releases/linux-2.6/2.6.26-17lenny2/debian/patches/bugfix/all/make-sock_sendpage-use-kernel_sendpage.patch
   dists/lenny/linux-2.6/debian/patches/series/17lenny2
      - copied unchanged from r14120, releases/linux-2.6/2.6.26-17lenny2/debian/patches/series/17lenny2
Modified:
   dists/lenny/linux-2.6/   (props changed)
   dists/lenny/linux-2.6/debian/changelog

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sun Aug 16 15:56:42 2009	(r14120)
+++ dists/lenny/linux-2.6/debian/changelog	Sun Aug 16 19:38:32 2009	(r14121)
@@ -50,6 +50,12 @@
 
  -- dann frazier <dannf at debian.org>  Fri, 31 Jul 2009 00:12:58 -0600
 
+linux-2.6 (2.6.26-17lenny2) stable-security; urgency=high
+
+  * Make sock_sendpage() use kernel_sendpage() (CVE-2009-2692)
+
+ -- dann frazier <dannf at debian.org>  Thu, 13 Aug 2009 15:41:34 -0600
+
 linux-2.6 (2.6.26-17lenny1) stable-security; urgency=high
 
   * [KVM] x86: check for cr3 validity in ioctl_set_sregs

Copied: dists/lenny/linux-2.6/debian/patches/bugfix/all/make-sock_sendpage-use-kernel_sendpage.patch (from r14120, releases/linux-2.6/2.6.26-17lenny2/debian/patches/bugfix/all/make-sock_sendpage-use-kernel_sendpage.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/make-sock_sendpage-use-kernel_sendpage.patch	Sun Aug 16 19:38:32 2009	(r14121, copy of r14120, releases/linux-2.6/2.6.26-17lenny2/debian/patches/bugfix/all/make-sock_sendpage-use-kernel_sendpage.patch)
@@ -0,0 +1,34 @@
+commit e694958388c50148389b0e9b9e9e8945cf0f1b98
+Author: Linus Torvalds <torvalds at linux-foundation.org>
+Date:   Thu Aug 13 08:28:36 2009 -0700
+
+    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,

Copied: dists/lenny/linux-2.6/debian/patches/series/17lenny2 (from r14120, releases/linux-2.6/2.6.26-17lenny2/debian/patches/series/17lenny2)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/series/17lenny2	Sun Aug 16 19:38:32 2009	(r14121, copy of r14120, releases/linux-2.6/2.6.26-17lenny2/debian/patches/series/17lenny2)
@@ -0,0 +1 @@
++ bugfix/all/make-sock_sendpage-use-kernel_sendpage.patch