r2783 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series
Andres Salomon
dilinger-guest@costa.debian.org
Tue, 22 Mar 2005 10:34:26 +0100
Author: dilinger-guest
Date: 2005-03-22 10:34:25 +0100 (Tue, 22 Mar 2005)
New Revision: 2783
Added:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ipv4-fragment-queues-2.1.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-15
Log:
* ipv4-fragment-queues-3.dpatch, ipv4-fragment-queues-3.dpatch,
ipv4-fragment-queues-2.1.dpatch
Revert patches -queues-3 and -queues-4 to revert ABI, for
sarge's rc3; also add patch -queues-2.1, which fixes a race in
-queues-2 (Andres Salomon, Simon Horman).
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-03-22 09:30:43 UTC (rev 2782)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-03-22 09:34:25 UTC (rev 2783)
@@ -7,10 +7,16 @@
* [Security] Fix remote dos on ppp servers. CAN-2005-0384 (Maximilian Attems)
- * ip_copy_metadata_leak.dpatch, ip6_copy_metadata_leak.dpatch
- [SECURITY] Fix memory exhaustion DoS triggered by leaks in
+ * [SECURITY] ip_copy_metadata_leak.dpatch, ip6_copy_metadata_leak.dpatch
+ Fix memory exhaustion DoS triggered by leaks in
ip*_copy_metadata CAN-2005-0210 (Andres Salomon).
+ * ipv4-fragment-queues-3.dpatch, ipv4-fragment-queues-3.dpatch,
+ ipv4-fragment-queues-2.1.dpatch
+ Revert patches -queues-3 and -queues-4 to revert ABI, for
+ sarge's rc3; also add patch -queues-2.1, which fixes a race in
+ -queues-2 (Andres Salomon, Simon Horman).
+
-- Simon Horman <horms@debian.org> Tue, 22 Mar 2005 15:29:10 +0900
kernel-source-2.6.8 (2.6.8-14) unstable; urgency=high
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ipv4-fragment-queues-2.1.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ipv4-fragment-queues-2.1.dpatch 2005-03-22 09:30:43 UTC (rev 2782)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ipv4-fragment-queues-2.1.dpatch 2005-03-22 09:34:25 UTC (rev 2783)
@@ -0,0 +1,35 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [NETFILTER]: Fix race when flushing fragment queue
+## DP: Patch author: Patrick McHardy <kaber@trash.net>
+## DP: Upstream status: unnecessary after private frag queues patches
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/08/29 23:36:17+02:00 <a href="https://lists.netfilter.org/mailman/listinfo/netfilter-devel">kaber at coreworks.de</a>
+# [NETFILTER]: Fix race when flushing fragment queue
+#
+# Signed-off-by: Patrick McHardy <<a href="https://lists.netfilter.org/mailman/listinfo/netfilter-devel">kaber at trash.net</a>>
+#
+# net/ipv4/netfilter/ip_conntrack_standalone.c
+# 2004/08/29 23:35:54+02:00 <a href="https://lists.netfilter.org/mailman/listinfo/netfilter-devel">kaber at coreworks.de</a> +1 -1
+# [NETFILTER]: Fix race when flushing fragment queue
+#
+diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- a/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-08-29 23:39:07 +02:00
++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-08-29 23:39:07 +02:00
+@@ -807,7 +807,7 @@
+ cleanup_defragops:
+ /* Frag queues may hold fragments with skb->dst == NULL */
+ ip_ct_no_defrag = 1;
+- smp_wmb();
++ synchronize_net();
+ local_bh_disable();
+ ipfrag_flush();
+ local_bh_enable();
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-15
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-15 2005-03-22 09:30:43 UTC (rev 2782)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-15 2005-03-22 09:34:25 UTC (rev 2783)
@@ -3,3 +3,6 @@
+ drivers-net-ppp_async-fix-dos.dpatch
+ ip_copy_metadata_leak.dpatch
+ ip6_copy_metadata_leak.dpatch
+- ipv4-fragment-queues-3.dpatch
+- ipv4-fragment-queues-4.dpatch
++ ipv4-fragment-queues-2.1.dpatch