- local root fix (http://lwn.net/Articles/347006/)

Changed files:
    kernel-sock-sendpage.patch -> 1.1.2.1
    kernel.spec -> 1.441.2.2036.2.32

diff --git a/kernel-sock-sendpage.patch b/kernel-sock-sendpage.patch
new file mode 100644 (file)
index 0000000..d3b07db
--- /dev/null
+++ b/kernel-sock-sendpage.patch
@@ -0,0 +1,36 @@
+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-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@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,

diff --git a/kernel.spec b/kernel.spec
index 7ad0bbe1af0e8957eed86019339e7cafae819cf2..ebe809cbc97bc927fae012bebb37f080f8c27d28 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -315,6 +315,7 @@ Patch2000:  kernel-small_fixes.patch
 Patch2001:     linux-2.6.21.1-pwc-uncompress.patch
 Patch2002:     kernel-atom-coretemp.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)
@@ -935,6 +936,7 @@ install %{SOURCE5} Makefile.ppclibs
 %patch2001 -p1
 %patch2002 -p1
 #%patch2003 -p1
+%patch2004 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{postver}%{?alt_kernel:_%{alt_kernel}}#g' Makefile