r4259 - in dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-09-22 10:04:27 +0000 (Thu, 22 Sep 2005)
New Revision: 4259

Added:
   dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/190_outs-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-12
Log:

+  * 190_outs-2.diff (removed 143_outs.diff):
+    [SECURITY]: AMD64, allows local users to write to privileged
+    IO ports via OUTS instruction
+    See CAN-2005-0204
+    143_outs.diff, included in 2.4.27-11 breaks the
+    build as IO_BITMAP_BYTES is not defined. 190_outs-2.diff
+    should resolve this problem by defining IO_BITMAP_BYTES
+    (closes: #329354)
+  * 191_build_foo.diff
+    Fix build problems that appear to be caused by recent binutils changes
+    (closes: #328707)


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	2005-09-22 09:36:43 UTC (rev 4258)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-09-22 10:04:27 UTC (rev 4259)
@@ -56,8 +56,20 @@
   * 179_net-ipv4-netfilter-ip_recent-last_pkts.diff
     Included in 2.4.27-11 is CAN-2005-2872
 
- -- Simon Horman <horms at debian.org>  Mon, 12 Sep 2005 17:12:07 +0900
+  * 190_outs-2.diff (removed 143_outs.diff):
+    [SECURITY]: AMD64, allows local users to write to privileged
+    IO ports via OUTS instruction
+    See CAN-2005-0204
+    143_outs.diff, included in 2.4.27-11 breaks the
+    build as IO_BITMAP_BYTES is not defined. 190_outs-2.diff
+    should resolve this problem by defining IO_BITMAP_BYTES
+    (closes: #329354)
+  * 191_build_foo.diff
+    Fix build problems that appear to be caused by recent binutils changes
+    (closes: #328707)
 
+ -- Simon Horman <horms at debian.org>  Thu, 22 Sep 2005 18:55:18 +0900
+
 kernel-source-2.4.27 (2.4.27-11) unstable; urgency=low
 
   [ Simon Horman ]

Copied: dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/190_outs-2.diff (from rev 4166, dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/143_outs.diff)
===================================================================
--- dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/143_outs.diff	2005-09-10 18:21:40 UTC (rev 4166)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/190_outs-2.diff	2005-09-22 10:04:27 UTC (rev 4259)
@@ -0,0 +1,30 @@
+Description: [CAN-2005-0204]: AMD64, allows local users to write to privileged IO ports via OUTS instruction
+Patch author: Suresh Siddha (suresh.b.siddha at intel.com)
+Upstream status: not applied
+URL: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146244
+Patch source: Micah Anderson <micah at riseup.net> (debian-kernel)
+
+Added definition of IO_BITMAP_BYTES for Debian's 2.4.27 and
+submitted upstream for consideration for inclusion in 2.4 -- Horms
+ 
+--- a/include/asm-x86_64/desc.h	2005-02-24 19:51:26.000000000 +0900
++++ b/include/asm-x86_64/desc.h	2005-02-24 19:52:40.000000000 +0900
+@@ -128,7 +128,7 @@
+ 
+ static inline void set_tss_desc(unsigned n, void *addr)
+ { 
+-	set_tssldt_descriptor((void *)&gdt_table + __CPU_DESC_INDEX(n,tss), (unsigned long)addr, DESC_TSS, sizeof(struct tss_struct)); 
++	set_tssldt_descriptor((void *)&gdt_table + __CPU_DESC_INDEX(n,tss), (unsigned long)addr, DESC_TSS, IO_BITMAP_OFFSET + IO_BITMAP_BYTES + 7); 
+ } 
+ 
+ static inline void set_ldt_desc(unsigned n, void *addr, int size)
+--- a/include/asm-x86_64/processor.h	2005-09-22 11:12:40.000000000 +0900
++++ b/include/asm-x86_64/processor.h	2005-09-22 11:12:43.000000000 +0900
+@@ -260,6 +260,7 @@
+  * Size of io_bitmap in longwords: 32 is ports 0-0x3ff.
+  */
+ #define IO_BITMAP_SIZE	32
++#define IO_BITMAP_BYTES (IO_BITMAP_SIZE * sizeof(u32))
+ #define IO_BITMAP_OFFSET offsetof(struct tss_struct,io_bitmap)
+ #define INVALID_IO_BITMAP_OFFSET 0x8000
+ 

Modified: dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-12
===================================================================
--- dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-12	2005-09-22 09:36:43 UTC (rev 4258)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-12	2005-09-22 10:04:27 UTC (rev 4259)
@@ -5,3 +5,6 @@
 + 188_fix-dst-leak-in-icmp_push_reply.diff
 + 189_ipv6-skb-leak.diff
 + 180_fs-isofs-ignored-parameters.diff
+- 143_outs.diff
++ 190_outs-2.diff
++ 191_build_foo.diff