packages (LINUX_2_6_29): kernel/kernel.spec, kernel/kernel-sock-sendpage.pa...

[baggins]

Author: baggins                      Date: Mon Aug 17 10:06:29 2009 GMT
Module: packages                      Tag: LINUX_2_6_29
---- Log message:
- local root fix (http://lwn.net/Articles/347006/)

---- Files affected:
packages/kernel:
   kernel.spec (1.676 -> 1.676.2.1) , kernel-sock-sendpage.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.676 packages/kernel/kernel.spec:1.676.2.1
--- packages/kernel/kernel.spec:1.676	Fri Jul  3 08:29:28 2009
+++ packages/kernel/kernel.spec	Mon Aug 17 12:06:24 2009
@@ -321,6 +321,7 @@
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
+Patch2004:	kernel-sock-sendpage.patch
 
 # kill some thousands of warnings
 # (only warnings, so just remove parts of this patch if conflics)
@@ -967,6 +968,7 @@
 %patch2000 -p1
 %patch2001 -p1
 #%patch2003 -p1
+%patch2004 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{postver}%{?alt_kernel:_%{alt_kernel}}#g' Makefile
@@ -1644,6 +1646,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.676.2.1  2009/08/17 10:06:24  baggins
+- local root fix (http://lwn.net/Articles/347006/)
+
 Revision 1.676  2009/07/03 06:29:28  arekm
 - drop tproxy
 

================================================================
Index: packages/kernel/kernel-sock-sendpage.patch
diff -u /dev/null packages/kernel/kernel-sock-sendpage.patch:1.2
--- /dev/null	Mon Aug 17 12:06:29 2009
+++ packages/kernel/kernel-sock-sendpage.patch	Mon Aug 17 12:06:24 2009
@@ -0,0 +1,36 @@
+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-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e694958388c50148389b0e9b9e9e8945cf0f1b98;hp=a3620f7545344f932873bf98fbdf416b49409c8e
+
+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,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.676&r2=1.676.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-sock-sendpage.patch?r1=1.1&r2=1.2&f=u