[kernel] r7317 - in
dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian:
. patches patches/series
Dann Frazier
dannf at costa.debian.org
Tue Sep 5 05:44:02 UTC 2006
Author: dannf
Date: Tue Sep 5 05:44:01 2006
New Revision: 7317
Added:
dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/hppa-mb-extraneous-semicolon.dpatch
dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc32-mb-extraneous-semicolons.dpatch
dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-mb-extraneous-semicolons.dpatch
Modified:
dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge5
Log:
* hppa-mb-extraneous-semicolon.dpatch,
sparc32-mb-extraneous-semicolons.dpatch,
sparc64-mb-extraneous-semicolons.dpatch:
Fix a syntax error caused by extranous semicolons in smp_mb() macros
which resulted in a build failure with the kfree_skb-race.dpatch
Modified: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
==============================================================================
--- dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog (original)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog Tue Sep 5 05:44:01 2006
@@ -52,6 +52,11 @@
* kfree_skb-race.dpatch
[SECURITY] Fix race between kfree_skb and __skb_unlink
See CVE-2006-2446
+ * hppa-mb-extraneous-semicolon.dpatch,
+ sparc32-mb-extraneous-semicolons.dpatch,
+ sparc64-mb-extraneous-semicolons.dpatch:
+ Fix a syntax error caused by extranous semicolons in smp_mb() macros
+ which resulted in a build failure with the kfree_skb-race.dpatch
* sctp-priv-elevation.dpatch, sctp-priv-elevation-2.dpatch
[SECURITY] Fix SCTP privelege escalation
See CVE-2006-3745
@@ -63,7 +68,7 @@
[SECURITY] Fix possible UDF deadlock and memory corruption
See CVE-2006-4145
- -- dann frazier <dannf at debian.org> Mon, 28 Aug 2006 23:15:37 -0600
+ -- dann frazier <dannf at debian.org> Mon, 4 Sep 2006 23:38:15 -0600
kernel-source-2.6.8 (2.6.8-16sarge4) stable-security; urgency=high
Added: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/hppa-mb-extraneous-semicolon.dpatch
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/hppa-mb-extraneous-semicolon.dpatch Tue Sep 5 05:44:01 2006
@@ -0,0 +1,28 @@
+diff -Naru a/include/asm-parisc/system.h b/include/asm-parisc/system.h
+--- a/include/asm-parisc/system.h 2006-09-04 19:40:22 -07:00
++++ b/include/asm-parisc/system.h 2006-09-04 19:40:22 -07:00
+@@ -125,7 +125,7 @@
+ ** The __asm__ op below simple prevents gcc/ld from reordering
+ ** instructions across the mb() "call".
+ */
+-#define mb() __asm__ __volatile__("":::"memory"); /* barrier() */
++#define mb() __asm__ __volatile__("":::"memory") /* barrier() */
+ #define rmb() mb()
+ #define wmb() mb()
+ #define smp_mb() mb()
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/03/10 12:53:08-08:00 willy at parisc-linux.org
+# [PATCH] PA-RISC mb() definition
+#
+# The extraneous semicolon in mb() breaks the SMP build in the new skbuff.h
+#
+# From: Grant Grundler <grundler at parisc-linux.org>
+# Signed-off-by: Matthew Wilcox <willy at parisc-linux.org>
+# Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+#
+# include/asm-parisc/system.h
+# 2005/03/10 09:18:20-08:00 willy at parisc-linux.org +1 -1
+# PA-RISC mb() definition
+#
Modified: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge5
==============================================================================
--- dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge5 (original)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge5 Tue Sep 5 05:44:01 2006
@@ -11,6 +11,9 @@
+ readv-writev-missing-lsm-check-compat.dpatch
+ snmp-nat-mem-corruption-fix.dpatch
+ kfree_skb-race.dpatch
++ hppa-mb-extraneous-semicolon.dpatch
++ sparc32-mb-extraneous-semicolons.dpatch
++ sparc64-mb-extraneous-semicolons.dpatch
+ sctp-priv-elevation.dpatch
+ sctp-priv-elevation-2.dpatch
+ ppc-hid0-dos.dpatch
Added: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc32-mb-extraneous-semicolons.dpatch
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc32-mb-extraneous-semicolons.dpatch Tue Sep 5 05:44:01 2006
@@ -0,0 +1,44 @@
+diff -Naru a/include/asm-sparc/system.h b/include/asm-sparc/system.h
+--- a/include/asm-sparc/system.h 2006-09-05 06:42:37 -07:00
++++ b/include/asm-sparc/system.h 2006-09-05 06:42:37 -07:00
+@@ -195,9 +195,9 @@
+ #define read_barrier_depends() do { } while(0)
+ #define set_mb(__var, __value) do { __var = __value; mb(); } while(0)
+ #define set_wmb(__var, __value) set_mb(__var, __value)
+-#define smp_mb() __asm__ __volatile__("":::"memory");
+-#define smp_rmb() __asm__ __volatile__("":::"memory");
+-#define smp_wmb() __asm__ __volatile__("":::"memory");
++#define smp_mb() __asm__ __volatile__("":::"memory")
++#define smp_rmb() __asm__ __volatile__("":::"memory")
++#define smp_wmb() __asm__ __volatile__("":::"memory")
+ #define smp_read_barrier_depends() do { } while(0)
+
+ #define nop() __asm__ __volatile__ ("nop");
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/02/10 17:12:02-08:00 mroos at linux.ee
+# [SPARC32]: Fix syntax errors from smp_{mb,rmb,wmb} on sparc32.
+#
+# smp_mb(), smp_rmp() and smp_wmb() definitions have a trailing semicolon
+# and cause compilation errors in single statement context, like
+# if-then-else on line 358 in include/linux/skbuff.h. This patch removes
+# all three offending semicolons to make it compile.
+#
+# Signed-off-by: Meelis Roos <mroos at linux.ee>
+# Acked-by: William Irwin <wli at holomorphy.com>
+# Signed-off-by: David S. Miller <davem at davemloft.net>
+#
+# include/asm-sparc/system.h
+# 2005/02/10 17:11:23-08:00 mroos at linux.ee +3 -3
+# [SPARC32]: Fix syntax errors from smp_{mb,rmb,wmb} on sparc32.
+#
+# smp_mb(), smp_rmp() and smp_wmb() definitions have a trailing semicolon
+# and cause compilation errors in single statement context, like
+# if-then-else on line 358 in include/linux/skbuff.h. This patch removes
+# all three offending semicolons to make it compile.
+#
+# Signed-off-by: Meelis Roos <mroos at linux.ee>
+# Acked-by: William Irwin <wli at holomorphy.com>
+# Signed-off-by: David S. Miller <davem at davemloft.net>
+#
Added: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-mb-extraneous-semicolons.dpatch
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-mb-extraneous-semicolons.dpatch Tue Sep 5 05:44:01 2006
@@ -0,0 +1,49 @@
+diff -Naru a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
+--- a/include/asm-sparc64/system.h 2006-09-05 06:46:38 -07:00
++++ b/include/asm-sparc64/system.h 2006-09-05 06:46:38 -07:00
+@@ -78,9 +78,9 @@
+
+ #define nop() __asm__ __volatile__ ("nop")
+
+-#define membar(type) __asm__ __volatile__ ("membar " type : : : "memory");
++#define membar(type) __asm__ __volatile__ ("membar " type : : : "memory")
+ #define mb() \
+- membar("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad");
++ membar("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad")
+ #define rmb() membar("#LoadLoad")
+ #define wmb() membar("#StoreStore")
+ #define read_barrier_depends() do { } while(0)
+@@ -95,9 +95,9 @@
+ #define smp_wmb() wmb()
+ #define smp_read_barrier_depends() read_barrier_depends()
+ #else
+-#define smp_mb() __asm__ __volatile__("":::"memory");
+-#define smp_rmb() __asm__ __volatile__("":::"memory");
+-#define smp_wmb() __asm__ __volatile__("":::"memory");
++#define smp_mb() __asm__ __volatile__("":::"memory")
++#define smp_rmb() __asm__ __volatile__("":::"memory")
++#define smp_wmb() __asm__ __volatile__("":::"memory")
+ #define smp_read_barrier_depends() do { } while(0)
+ #endif
+
+@@ -107,7 +107,7 @@
+
+ /* Performance counter register access. */
+ #define read_pcr(__p) __asm__ __volatile__("rd %%pcr, %0" : "=r" (__p))
+-#define write_pcr(__p) __asm__ __volatile__("wr %0, 0x0, %%pcr" : : "r" (__p));
++#define write_pcr(__p) __asm__ __volatile__("wr %0, 0x0, %%pcr" : : "r" (__p))
+ #define read_pic(__p) __asm__ __volatile__("rd %%pic, %0" : "=r" (__p))
+
+ /* Blackbird errata workaround. See commentary in
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2005/02/05 19:51:48-08:00 davem at nuts.davemloft.net
+# [SPARC64]: Kill spurious semicolons in some system.h macros
+#
+# Signed-off-by: David S. Miller <davem at davemloft.net>
+#
+# include/asm-sparc64/system.h
+# 2005/02/05 19:51:05-08:00 davem at nuts.davemloft.net +6 -6
+# [SPARC64]: Kill spurious semicolons in some system.h macros
+#
More information about the Kernel-svn-changes
mailing list