[kernel] r5740 - in dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: Wed Feb  8 09:46:05 2006
New Revision: 5740

Added:
   dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/192_orinoco-info-leak-2.diff
Modified:
   dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-13
Log:
  * Missing symbol in orinoco.c
    The addition of 192_orinoco-info-leak.diff in 2.4.27-12 as a fix
    for CAN-2005-3180 introduced a missing symbol, ALIGN. This patch adds it.
    (closes: #344036)
    192_orinoco-info-leak-2.diff


Modified: dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
==============================================================================
--- dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	(original)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	Wed Feb  8 09:46:05 2006
@@ -49,6 +49,12 @@
     194_xfs-bad-inodes.diff
     (closes: #343970)
 
+  * Missing symbol in orinoco.c
+    The addition of 192_orinoco-info-leak.diff in 2.4.27-12 as a fix
+    for CAN-2005-3180 introduced a missing symbol, ALIGN. This patch adds it.
+    (closes: #344036)
+    192_orinoco-info-leak-2.diff
+
   [ Dann Frazier / Simon Horman ]
 
   * [SECURITY] Require root privilege to write the current
@@ -86,7 +92,7 @@
     home space mode in space switch event exception handler. See CAN-2004-0887.
     206_s390-sacf-fix.diff
 
- -- Simon Horman <horms at debian.org>  Wed,  8 Feb 2006 12:05:39 +0900
+ -- Simon Horman <horms at debian.org>  Wed,  8 Feb 2006 18:40:23 +0900
 
 kernel-source-2.4.27 (2.4.27-12) unstable; urgency=low
 

Added: dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/192_orinoco-info-leak-2.diff
==============================================================================
--- (empty file)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/192_orinoco-info-leak-2.diff	Wed Feb  8 09:46:05 2006
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/hermes.c
++++ b/drivers/net/wireless/hermes.c
+@@ -2312,6 +2312,8 @@ orinoco_stat_gather(struct net_device *d
+ 	}
+ }
+ 
++#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
++
+ static int
+ orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
+ {

Modified: dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-13
==============================================================================
--- dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-13	(original)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-13	Wed Feb  8 09:46:05 2006
@@ -1,5 +1,6 @@
 + 150_private_fragment_queues-1.diff
 + 150_private_fragment_queues-2.diff
++ 192_orinoco-info-leak-2.diff
 + 194_xfs-bad-inodes.diff
 + 196_sysctl-unregistration-oops.diff
 + 197_setkeys-needs-root-1.diff