r4078 - in branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

Simon Horman horms at costa.debian.org
Wed Aug 31 08:21:55 UTC 2005 

Author: horms
Date: 2005-08-31 08:21:54 +0000 (Wed, 31 Aug 2005)
New Revision: 4078

Added:
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-dst-leak-in-icmp_push_reply.dpatch
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.dpatch
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/zlib-revert-broken-change.dpatch
Removed:
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-dst-leak-in-icmp_push_reply.patch
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.patch
Modified:
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
Log:
added zlib-revert-broken-change.dpatch and renamed some patches

Modified: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-08-31 08:16:45 UTC (rev 4077)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-08-31 08:21:54 UTC (rev 4078)
@@ -191,10 +191,10 @@
     [Security, x86_64] Disable exception stack for stack faults
     See CAN-2005-1767
 
-  * linux-zlib-fixes.dpatch
+  * linux-zlib-fixes.dpatch, zlib-revert-broken-change.dpatch
     [Security] Fix security bugs in the Linux zlib implementations.
     See CAN-2005-2458, CAN-2005-2459
-    From 2.6.12.5
+    From 2.6.12.5 and 2.6.12.6
     http://sources.redhat.com/ml/bug-gnu-utils/1999-06/msg00183.html
     http://bugs.gentoo.org/show_bug.cgi?id=94584
 
@@ -222,8 +222,9 @@
     NPTL signal delivery deadlock fix
     Backported From 2.6.12.6
 
- -- Simon Horman <horms at debian.org>  Wed, 31 Aug 2005 16:35:24 +0900
 
+ -- Simon Horman <horms at debian.org>  Wed, 31 Aug 2005 17:18:43 +0900
+
 kernel-source-2.6.8 (2.6.8-16) unstable; urgency=low
 
   * smbfs-overrun.dpatch:

Copied: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-dst-leak-in-icmp_push_reply.dpatch (from rev 4076, branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-dst-leak-in-icmp_push_reply.patch)

Deleted: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-dst-leak-in-icmp_push_reply.patch
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-dst-leak-in-icmp_push_reply.patch	2005-08-31 08:16:45 UTC (rev 4077)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fix-dst-leak-in-icmp_push_reply.patch	2005-08-31 08:21:54 UTC (rev 4078)
@@ -1,40 +0,0 @@
-From linux-kernel-owner+chrisw=40osdl.org-S932397AbVHRS7i at vger.kernel.org Thu Aug 18 12:00:13 2005
-Date:   Thu, 18 Aug 2005 20:59:37 +0200
-From: Patrick McHardy <kaber at trash.net>
-To: Ollie Wild <aaw at rincewind.tv>
-CC: linux-kernel at vger.kernel.org, Maillist netdev <netdev at oss.sgi.com>
-Subject: [IPV4]: Fix DST leak in icmp_push_reply()
-
-Based upon a bug report and initial patch by
-Ollie Wild.
-
-Signed-off-by: Patrick McHardy <kaber at trash.net>
-Signed-off-by: "David S. Miller" <davem at davemloft.net>
-Signed-off-by: Chris Wright <chrisw at osdl.org>
----
- net/ipv4/icmp.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-Index: linux-2.6.12.y/net/ipv4/icmp.c
-===================================================================
---- linux-2.6.12.y.orig/net/ipv4/icmp.c
-+++ linux-2.6.12.y/net/ipv4/icmp.c
-@@ -349,12 +349,12 @@ static void icmp_push_reply(struct icmp_
- {
- 	struct sk_buff *skb;
- 
--	ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param,
--		       icmp_param->data_len+icmp_param->head_len,
--		       icmp_param->head_len,
--		       ipc, rt, MSG_DONTWAIT);
--
--	if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) {
-+	if (ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param,
-+		           icmp_param->data_len+icmp_param->head_len,
-+		           icmp_param->head_len,
-+		           ipc, rt, MSG_DONTWAIT) < 0)
-+		ip_flush_pending_frames(icmp_socket->sk);
-+	else if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) {
- 		struct icmphdr *icmph = skb->h.icmph;
- 		unsigned int csum = 0;
- 		struct sk_buff *skb1;

Copied: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.dpatch (from rev 4077, branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.patch)

Deleted: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.patch
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.patch	2005-08-31 08:16:45 UTC (rev 4077)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.patch	2005-08-31 08:21:54 UTC (rev 4078)
@@ -1,15 +0,0 @@
---- a/kernel/signal.c	2005-08-31 17:04:28.000000000 +0900
-+++ b/kernel/signal.c	2005-08-31 17:05:44.000000000 +0900
-@@ -631,6 +631,12 @@
- {
- 	struct task_struct *t;
- 
-+        if (p->signal->flags & SIGNAL_GROUP_EXIT)
-+		/*
-+		 * The process is in the middle of dying already.
-+		 */
-+		return;
-+
- 	if (sig_kernel_stop(sig)) {
- 		/*
- 		 * This is a stop signal.  Remove SIGCONT from all queues.

Modified: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-31 08:16:45 UTC (rev 4077)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-31 08:21:54 UTC (rev 4078)
@@ -54,5 +54,6 @@
 + zisofs.dpatch
 + module-per-cpu-alignment-fix.dpatch
 + net-sockglue-cap.dpatch
-+ fix-dst-leak-in-icmp_push_reply.patch
-+ nptl-signal-delivery-deadlock-fix.patch
++ fix-dst-leak-in-icmp_push_reply.dpatch
++ nptl-signal-delivery-deadlock-fix.dpatch
++ zlib-revert-broken-change.dpatch

Added: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/zlib-revert-broken-change.dpatch
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/zlib-revert-broken-change.dpatch	2005-08-31 08:16:45 UTC (rev 4077)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/zlib-revert-broken-change.dpatch	2005-08-31 08:21:54 UTC (rev 4078)
@@ -0,0 +1,37 @@
+From plasmaroo at gentoo.org  Wed Aug 17 13:19:31 2005
+Date: Wed, 17 Aug 2005 21:19:24 +0100
+Subject: [PATCH] Revert unnecessary zlib_inflate/inftrees.c fix
+
+From: Linus Torvalds <torvalds at osdl.org>
+
+It turns out that empty distance code tables are not an error, and that
+a compressed block with only literals can validly have an empty table
+and should not be flagged as a data error.
+
+Some old versions of gzip had problems with this case, but it does not
+affect the zlib code in the kernel.
+
+Analysis and explanations thanks to Sergey Vlasov <vsu at altlinux.ru>
+
+Cc: Sergey Vlasov <vsu at altlinux.ru>
+Cc: Tavis Ormandy <taviso at gentoo.org>
+Cc: Tim Yamin <plasmaroo at gentoo.org>
+Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+Signed-off-by: Chris Wright <chrisw at osdl.org>
+---
+ lib/zlib_inflate/inftrees.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.12.y/lib/zlib_inflate/inftrees.c
+===================================================================
+--- linux-2.6.12.y.orig/lib/zlib_inflate/inftrees.c
++++ linux-2.6.12.y/lib/zlib_inflate/inftrees.c
+@@ -141,7 +141,7 @@ static int huft_build(
+   {
+     *t = NULL;
+     *m = 0;
+-    return Z_DATA_ERROR;
++    return Z_OK;
+   }
+ 
+

More information about the Kernel-svn-changes mailing list