r2499 - in trunk/kernel/source: kernel-source-2.6.10-2.6.10/debian kernel-source-2.6.10-2.6.10/debian/patches kernel-source-2.6.10-2.6.10/debian/patches/series kernel-source-2.6.8-2.6.8/debian kernel-source-2.6.8-2.6.8/debian/patches kernel-source-2.6.8-2.6.8/debian/patches/series kernel-source-2.6.9-2.6.9/debian kernel-source-2.6.9-2.6.9/debian/patches kernel-source-2.6.9-2.6.9/debian/patches/series
Joshua Kwan
joshk@costa.debian.org
Thu, 17 Feb 2005 02:52:41 +0100
Author: joshk
Date: 2005-02-17 02:52:39 +0100 (Thu, 17 Feb 2005)
New Revision: 2499
Added:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-nis-killer.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-nis-killer.dpatch
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc64-nis-killer.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
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-14
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-6
Log:
add sparc64-nis-killer.dpatch globally
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-02-17 01:52:39 UTC (rev 2499)
@@ -8,12 +8,16 @@
* atyfb-sparc.dpatch: Fix post-2.6.10 atyfb breakage on SPARC32/64.
closes: #295488 (Joshua Kwan)
-
+
* skb-reset-ip_summed.dpatch: resolve checksumming exploit in
fragmented packet forwarding (Joshua Kwan)
- -- Joshua Kwan <joshk@triplehelix.org> Wed, 16 Feb 2005 16:14:19 -0800
+ * sparc64-nis-killer.dpatch: patch that fixes some compatibility functions
+ that (as a side effect) caused NIS to flatten a sparc64 machine.
+ closes: #295628 (Joshua Kwan)
+ -- Joshua Kwan <joshk@triplehelix.org> Wed, 16 Feb 2005 17:51:30 -0800
+
kernel-source-2.6.10 (2.6.10-5) unstable; urgency=low
* Change $((exp) | exp) to $( (exp) | exp), so things work with dash
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6 2005-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6 2005-02-17 01:52:39 UTC (rev 2499)
@@ -1,2 +1,3 @@
+ atyfb-sparc.dpatch
+ skb-reset-ip_summed.dpatch
++ sparc64-nis-killer.dpatch
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-nis-killer.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-nis-killer.dpatch 2005-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-nis-killer.dpatch 2005-02-17 01:52:39 UTC (rev 2499)
@@ -0,0 +1,29 @@
+# origin: linux-sparc (davem)
+# key: 42083fb5G9VacMhj0X7v5aPmZaQGXw (linux-2.5)
+# inclusion: projected 2.6.11
+# description: this fixes the NIS killer #288180
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/02/07 20:27:33-08:00 davem@nuts.davemloft.net
+# [SPARC64]: Mask off stack ptr in compat_alloc_user_space() for 32-bit.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# include/asm-sparc64/compat.h
+# 2005/02/07 20:26:55-08:00 davem@nuts.davemloft.net +2 -0
+# [SPARC64]: Mask off stack ptr in compat_alloc_user_space() for 32-bit.
+#
+diff -Nru a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
+--- a/include/asm-sparc64/compat.h 2005-02-16 17:37:34 -08:00
++++ b/include/asm-sparc64/compat.h 2005-02-16 17:37:34 -08:00
+@@ -133,6 +133,8 @@
+
+ if (!(test_thread_flag(TIF_32BIT)))
+ usp += STACK_BIAS;
++ else
++ usp &= 0xffffffffUL;
+
+ return (void __user *) (usp - len);
+ }
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-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-02-17 01:52:39 UTC (rev 2499)
@@ -20,12 +20,16 @@
* Updated apply script so it can handle point versions
(Simon Horman)
-
+
* skb-reset-ip_summed.dpatch: resolve checksumming exploit in
fragmented packet forwarding (Joshua Kwan)
- -- Joshua Kwan <joshk@triplehelix.org> Wed, 16 Feb 2005 16:11:59 -0800
+ * sparc64-nis-killer.dpatch: patch that fixes some compatibility functions
+ that (as a side effect) caused NIS to flatten a sparc64 machine.
+ closes: #295626 (Joshua Kwan)
+ -- Joshua Kwan <joshk@triplehelix.org> Wed, 16 Feb 2005 17:50:17 -0800
+
kernel-source-2.6.8 (2.6.8-13) unstable; urgency=high
* add more USB card reader blacklist entries. Patch from Fedora via
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14 2005-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14 2005-02-17 01:52:39 UTC (rev 2499)
@@ -6,3 +6,4 @@
+ ia64-ptrace-fixes.dpatch
+ ia64-unwind-fix.dpatch
+ skb-reset-ip_summed.dpatch
++ sparc64-nis-killer.dpatch
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-nis-killer.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-nis-killer.dpatch 2005-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-nis-killer.dpatch 2005-02-17 01:52:39 UTC (rev 2499)
@@ -0,0 +1,29 @@
+# origin: linux-sparc (davem)
+# key: 42083fb5G9VacMhj0X7v5aPmZaQGXw (linux-2.5)
+# inclusion: projected 2.6.11
+# description: this fixes the NIS killer #288180
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/02/07 20:27:33-08:00 davem@nuts.davemloft.net
+# [SPARC64]: Mask off stack ptr in compat_alloc_user_space() for 32-bit.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# include/asm-sparc64/compat.h
+# 2005/02/07 20:26:55-08:00 davem@nuts.davemloft.net +2 -0
+# [SPARC64]: Mask off stack ptr in compat_alloc_user_space() for 32-bit.
+#
+diff -Nru a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
+--- a/include/asm-sparc64/compat.h 2005-02-16 17:37:34 -08:00
++++ b/include/asm-sparc64/compat.h 2005-02-16 17:37:34 -08:00
+@@ -133,6 +133,8 @@
+
+ if (!(test_thread_flag(TIF_32BIT)))
+ usp += STACK_BIAS;
++ else
++ usp &= 0xffffffffUL;
+
+ return (void __user *) (usp - len);
+ }
Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog 2005-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog 2005-02-17 01:52:39 UTC (rev 2499)
@@ -27,12 +27,16 @@
* Updated apply script so it can handle point versions
(Simon Horman)
-
+
* skb-reset-ip_summed.dpatch: resolve checksumming exploit in
fragmented packet forwarding (Joshua Kwan)
- -- Joshua Kwan <joshk@triplehelix.org> Wed, 16 Feb 2005 16:12:53 -0800
+ * sparc64-nis-killer.dpatch: patch that fixes some compatibility functions
+ that (as a side effect) caused NIS to flatten a sparc64 machine.
+ closes: #295627 (Joshua Kwan)
+ -- Joshua Kwan <joshk@triplehelix.org> Wed, 16 Feb 2005 17:50:54 -0800
+
kernel-source-2.6.9 (2.6.9-5) unstable; urgency=low
* [powerpc] Added a couple of powermac patches from Benjamin Herrenschmidt :
Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-6 2005-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-6 2005-02-17 01:52:39 UTC (rev 2499)
@@ -3,3 +3,4 @@
+ 035-do_brk_security_fixes-2.dpatch
+ au88x0-use-short-name.dpatch
+ skb-reset-ip_summed.dpatch
++ sparc64-nis-killer.dpatch
Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc64-nis-killer.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc64-nis-killer.dpatch 2005-02-17 00:20:25 UTC (rev 2498)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc64-nis-killer.dpatch 2005-02-17 01:52:39 UTC (rev 2499)
@@ -0,0 +1,29 @@
+# origin: linux-sparc (davem)
+# key: 42083fb5G9VacMhj0X7v5aPmZaQGXw (linux-2.5)
+# inclusion: projected 2.6.11
+# description: this fixes the NIS killer #288180
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/02/07 20:27:33-08:00 davem@nuts.davemloft.net
+# [SPARC64]: Mask off stack ptr in compat_alloc_user_space() for 32-bit.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# include/asm-sparc64/compat.h
+# 2005/02/07 20:26:55-08:00 davem@nuts.davemloft.net +2 -0
+# [SPARC64]: Mask off stack ptr in compat_alloc_user_space() for 32-bit.
+#
+diff -Nru a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
+--- a/include/asm-sparc64/compat.h 2005-02-16 17:37:34 -08:00
++++ b/include/asm-sparc64/compat.h 2005-02-16 17:37:34 -08:00
+@@ -133,6 +133,8 @@
+
+ if (!(test_thread_flag(TIF_32BIT)))
+ usp += STACK_BIAS;
++ else
++ usp &= 0xffffffffUL;
+
+ return (void __user *) (usp - len);
+ }