Author: pluto Date: Mon Sep 19 02:21:36 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- cleanups.
---- Files affected:
SOURCES:
linux-2.6.13.1-grsec.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6.13.1-grsec.patch
diff -u SOURCES/linux-2.6.13.1-grsec.patch:1.1.2.1
SOURCES/linux-2.6.13.1-grsec.patch:1.1.2.2
--- SOURCES/linux-2.6.13.1-grsec.patch:1.1.2.1 Wed Sep 14 13:37:41 2005
+++ SOURCES/linux-2.6.13.1-grsec.patch Mon Sep 19 04:21:30 2005
@@ -1,18 +1,6 @@
-diff -Nur linux-2.6.13.1.org/Makefile grsecurity226/Makefile
---- linux-2.6.13.1.org/Makefile 2005-09-10 04:42:58.000000000 +0200
-+++ grsecurity226/Makefile 2005-08-30 01:12:29.000000000 +0200
-@@ -562,7 +562,7 @@
-
-
- ifeq ($(KBUILD_EXTMOD),)
--core-y += kernel/ mm/ fs/ ipc/ security/ crypto/
-+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ grsecurity/
-
- vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
- $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -Nur linux-2.6.13.1.org/arch/alpha/kernel/osf_sys.c
grsecurity226/arch/alpha/kernel/osf_sys.c
---- linux-2.6.13.1.org/arch/alpha/kernel/osf_sys.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/alpha/kernel/osf_sys.c 2005-09-13 23:56:59.000000000
+0200
+diff -uNr linux-2.6.13.1.org/arch/alpha/kernel/osf_sys.c
grsecurity226/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.13.1.org/arch/alpha/kernel/osf_sys.c 2005-09-17
03:02:12.000000000 +0200
++++ grsecurity226/arch/alpha/kernel/osf_sys.c 2005-09-19 03:20:21.000000000
+0200
@@ -1268,6 +1268,10 @@
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -35,9 +23,9 @@
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -Nur linux-2.6.13.1.org/arch/alpha/kernel/ptrace.c
grsecurity226/arch/alpha/kernel/ptrace.c
---- linux-2.6.13.1.org/arch/alpha/kernel/ptrace.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/alpha/kernel/ptrace.c 2005-08-30 01:12:33.000000000
+0200
+diff -uNr linux-2.6.13.1.org/arch/alpha/kernel/ptrace.c
grsecurity226/arch/alpha/kernel/ptrace.c
+--- linux-2.6.13.1.org/arch/alpha/kernel/ptrace.c 2005-09-17
03:02:12.000000000 +0200
++++ grsecurity226/arch/alpha/kernel/ptrace.c 2005-09-19 03:20:21.000000000
+0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -56,9 +44,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -Nur linux-2.6.13.1.org/arch/alpha/mm/fault.c
grsecurity226/arch/alpha/mm/fault.c
---- linux-2.6.13.1.org/arch/alpha/mm/fault.c 2005-09-10 04:42:58.000000000
+0200
-+++ grsecurity226/arch/alpha/mm/fault.c 2005-08-30 01:12:35.000000000
+0200
+diff -uNr linux-2.6.13.1.org/arch/alpha/mm/fault.c
grsecurity226/arch/alpha/mm/fault.c
+--- linux-2.6.13.1.org/arch/alpha/mm/fault.c 2005-09-17 03:02:12.000000000
+0200
++++ grsecurity226/arch/alpha/mm/fault.c 2005-09-19 03:20:21.000000000
+0200
@@ -25,6 +25,7 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
@@ -224,9 +212,9 @@
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -Nur linux-2.6.13.1.org/arch/arm/mm/mmap.c
grsecurity226/arch/arm/mm/mmap.c
---- linux-2.6.13.1.org/arch/arm/mm/mmap.c 2005-09-10 04:42:58.000000000
+0200
-+++ grsecurity226/arch/arm/mm/mmap.c 2005-08-30 01:12:38.000000000 +0200
+diff -uNr linux-2.6.13.1.org/arch/arm/mm/mmap.c
grsecurity226/arch/arm/mm/mmap.c
+--- linux-2.6.13.1.org/arch/arm/mm/mmap.c 2005-09-17 03:02:12.000000000
+0200
++++ grsecurity226/arch/arm/mm/mmap.c 2005-09-19 03:20:21.000000000 +0200
@@ -62,6 +62,10 @@
if (len > TASK_SIZE)
return -ENOMEM;
@@ -258,433 +246,9 @@
mm->cached_hole_size = 0;
goto full_search;
}
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/README.mm
grsecurity226/arch/cris/arch-v10/README.mm
---- linux-2.6.13.1.org/arch/cris/arch-v10/README.mm 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/README.mm 2005-08-30 00:59:40.000000000
+0200
-@@ -3,6 +3,9 @@
- HISTORY:
-
- $Log$
- Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- - initial
- NFY
-
-+Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+Initial import of Linux 2.6.13
-+
- Revision 1.1 2001/12/17 13:59:27 bjornw
- Initial revision
-
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/axisflashmap.c
grsecurity226/arch/cris/arch-v10/drivers/axisflashmap.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/axisflashmap.c
2005-09-10 04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/drivers/axisflashmap.c 2005-08-30
00:59:40.000000000 +0200
-@@ -11,6 +11,9 @@
- * partition split defined below.
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.11 2004/11/15 10:27:14 starvik
- * Corrected typo (Thanks to Milton Miller <[EMAIL PROTECTED]>).
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/ds1302.c
grsecurity226/arch/cris/arch-v10/drivers/ds1302.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/ds1302.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/drivers/ds1302.c 2005-08-30
00:59:40.000000000 +0200
-@@ -7,6 +7,9 @@
- *! Functions exported: ds1302_readreg, ds1302_writereg, ds1302_init
- *!
- *! $Log$
- *! Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- *! - initial
- *! NFY
- *!
-+*! Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+*! Initial import of Linux 2.6.13
-+*!
- *! Revision 1.18 2005/01/24 09:11:26 mikaelam
- *! Minor changes to get DS1302 RTC chip driver to work
- *!
-@@ -135,7 +138,7 @@
- *!
- *! (C) Copyright 1999, 2000, 2001, 2002, 2003, 2004 Axis Communications AB,
LUND, SWEDEN
- *!
--*! $Id$
-+*! $Id$
- *!
- *!***************************************************************************/
-
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/eeprom.c
grsecurity226/arch/cris/arch-v10/drivers/eeprom.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/eeprom.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/drivers/eeprom.c 2005-08-30
00:59:40.000000000 +0200
-@@ -20,6 +20,9 @@
- *! in the spin-lock.
- *!
- *! $Log$
- *! Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- *! - initial
- *! NFY
- *!
-+*! Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+*! Initial import of Linux 2.6.13
-+*!
- *! Revision 1.12 2005/06/19 17:06:46 starvik
- *! Merge of Linux 2.6.12.
- *!
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/gpio.c
grsecurity226/arch/cris/arch-v10/drivers/gpio.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/gpio.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/drivers/gpio.c 2005-08-30
00:59:40.000000000 +0200
-@@ -1,4 +1,4 @@
--/* $Id$
-+/* $Id$
- *
- * Etrax general port I/O device
- *
-@@ -9,6 +9,9 @@
- * Johan Adolfsson (read/set directions, write, port G)
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.17 2005/06/19 17:06:46 starvik
- * Merge of Linux 2.6.12.
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/i2c.c
grsecurity226/arch/cris/arch-v10/drivers/i2c.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/i2c.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/drivers/i2c.c 2005-08-30
00:59:40.000000000 +0200
-@@ -12,6 +12,9 @@
- *! don't use PB_I2C if DS1302 uses same bits,
- *! use PB.
- *! $Log$
- *! Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- *! - initial
- *! NFY
- *!
-+*! Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+*! Initial import of Linux 2.6.13
-+*!
- *! Revision 1.13 2005/03/07 13:13:07 starvik
- *! Added spinlocks to protect states etc
- *!
-@@ -84,7 +87,7 @@
- *! (C) Copyright 1999-2002 Axis Communications AB, LUND, SWEDEN
- *!
- *!***************************************************************************/
--/* $Id$ */
-+/* $Id$ */
-
- /****************** INCLUDE FILES SECTION ***********************************/
-
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/pcf8563.c
grsecurity226/arch/cris/arch-v10/drivers/pcf8563.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/pcf8563.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/drivers/pcf8563.c 2005-08-30
00:59:40.000000000 +0200
-@@ -15,7 +15,7 @@
- *
- * Author: Tobias Anderberg <[EMAIL PROTECTED]>.
- *
-- * $Id$
-+ * $Id$
- */
-
- #include <linux/config.h>
-@@ -40,7 +40,7 @@
- #define PCF8563_MAJOR 121 /* Local major number. */
- #define DEVICE_NAME "rtc" /* Name which is registered in
/proc/devices. */
- #define PCF8563_NAME "PCF8563"
--#define DRIVER_VERSION "$Revision$"
-+#define DRIVER_VERSION "$Revision$"
-
- /* I2C bus slave registers. */
- #define RTC_I2C_READ 0xa3
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/debugport.c
grsecurity226/arch/cris/arch-v10/kernel/debugport.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/debugport.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/kernel/debugport.c 2005-08-30
00:59:40.000000000 +0200
-@@ -12,6 +12,9 @@
- * init_etrax_debug()
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.27 2005/06/10 10:34:14 starvik
- * Real console support
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/entry.S
grsecurity226/arch/cris/arch-v10/kernel/entry.S
---- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/entry.S 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/kernel/entry.S 2005-08-30
00:59:40.000000000 +0200
-@@ -1,4 +1,4 @@
--/* $Id$
-+/* $Id$
- *
- * linux/arch/cris/entry.S
- *
-@@ -7,6 +7,9 @@
- * Authors: Bjorn Wesen ([EMAIL PROTECTED])
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.28 2005/06/20 05:06:30 starvik
- * Remove unnecessary diff to kernel.org tree
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/fasttimer.c
grsecurity226/arch/cris/arch-v10/kernel/fasttimer.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/fasttimer.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/kernel/fasttimer.c 2005-08-30
00:59:40.000000000 +0200
-@@ -1,10 +1,13 @@
--/* $Id$
-+/* $Id$
- * linux/arch/cris/kernel/fasttimer.c
- *
- * Fast timers for ETRAX100/ETRAX100LX
- * This may be useful in other OS than Linux so use 2 space indentation...
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.9 2005/03/04 08:16:16 starvik
- * Merge of Linux 2.6.11.
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/head.S
grsecurity226/arch/cris/arch-v10/kernel/head.S
---- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/head.S 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/kernel/head.S 2005-08-30
00:59:40.000000000 +0200
-@@ -1,4 +1,4 @@
--/* $Id$
-+/* $Id$
- *
- * Head of the kernel - alter with care
- *
-@@ -7,6 +7,9 @@
- * Authors: Bjorn Wesen ([EMAIL PROTECTED])
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.10 2005/06/20 05:12:54 starvik
- * Remove unnecessary diff to kernel.org tree
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/kgdb.c
grsecurity226/arch/cris/arch-v10/kernel/kgdb.c
---- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/kgdb.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/kernel/kgdb.c 2005-08-30
00:59:40.000000000 +0200
-@@ -18,6 +18,9 @@
- *! Jul 21 1999 Bjorn Wesen eLinux port
- *!
- *! $Log$
- *! Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- *! - initial
- *! NFY
- *!
-+*! Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+*! Initial import of Linux 2.6.13
-+*!
- *! Revision 1.6 2005/01/14 10:12:17 starvik
- *! KGDB on separate port.
- *! Console fixes from 2.4.
-@@ -75,7 +78,7 @@
- *!
- *!---------------------------------------------------------------------------
- *!
--*! $Id$
-+*! $Id$
- *!
- *! (C) Copyright 1999, Axis Communications AB, LUND, SWEDEN
- *!
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/lib/dram_init.S
grsecurity226/arch/cris/arch-v10/lib/dram_init.S
---- linux-2.6.13.1.org/arch/cris/arch-v10/lib/dram_init.S 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v10/lib/dram_init.S 2005-08-30
00:59:40.000000000 +0200
-@@ -1,4 +1,4 @@
--/* $Id$
-+/* $Id$
- *
- * DRAM/SDRAM initialization - alter with care
- * This file is intended to be included from other assembler files
-@@ -11,6 +11,9 @@
- * Authors: Mikael Starvik ([EMAIL PROTECTED])
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.4 2003/09/22 09:21:59 starvik
- * Decompresser is linked to 0x407xxxxx and sdram commands are at 0x000xxxxx
- * so we need to mask off 12 bits.
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v32/drivers/gpio.c
grsecurity226/arch/cris/arch-v32/drivers/gpio.c
---- linux-2.6.13.1.org/arch/cris/arch-v32/drivers/gpio.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v32/drivers/gpio.c 2005-08-30
00:59:40.000000000 +0200
-@@ -1,4 +1,4 @@
--/* $Id$
-+/* $Id$
- *
- * ETRAX CRISv32 general port I/O device
- *
-@@ -10,6 +10,9 @@
- * port to ETRAX FS.
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.16 2005/06/19 17:06:49 starvik
- * Merge of Linux 2.6.12.
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v32/drivers/pcf8563.c
grsecurity226/arch/cris/arch-v32/drivers/pcf8563.c
---- linux-2.6.13.1.org/arch/cris/arch-v32/drivers/pcf8563.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v32/drivers/pcf8563.c 2005-08-30
00:59:40.000000000 +0200
-@@ -39,7 +39,7 @@
- #define PCF8563_MAJOR 121 /* Local major number. */
- #define DEVICE_NAME "rtc" /* Name which is registered in /proc/devices. */
- #define PCF8563_NAME "PCF8563"
--#define DRIVER_VERSION "$Revision$"
-+#define DRIVER_VERSION "$Revision$"
-
- /* Two simple wrapper macros, saves a few keystrokes. */
- #define rtc_read(x) i2c_readreg(RTC_I2C_READ, x)
-diff -Nur linux-2.6.13.1.org/arch/cris/arch-v32/kernel/fasttimer.c
grsecurity226/arch/cris/arch-v32/kernel/fasttimer.c
---- linux-2.6.13.1.org/arch/cris/arch-v32/kernel/fasttimer.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/arch-v32/kernel/fasttimer.c 2005-08-30
00:59:40.000000000 +0200
-@@ -1,10 +1,13 @@
--/* $Id$
-+/* $Id$
- * linux/arch/cris/kernel/fasttimer.c
- *
- * Fast timers for ETRAX FS
- * This may be useful in other OS than Linux so use 2 space indentation...
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.11 2005/01/04 11:15:46 starvik
- * Don't share timer IRQ.
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/kernel/process.c
grsecurity226/arch/cris/kernel/process.c
---- linux-2.6.13.1.org/arch/cris/kernel/process.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/kernel/process.c 2005-08-30 00:59:40.000000000
+0200
-@@ -1,4 +1,4 @@
--/* $Id$
-+/* $Id$
- *
- * linux/arch/cris/kernel/process.c
- *
-@@ -8,6 +8,9 @@
- * Authors: Bjorn Wesen ([EMAIL PROTECTED])
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.21 2005/03/04 08:16:17 starvik
- * Merge of Linux 2.6.11.
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/kernel/ptrace.c
grsecurity226/arch/cris/kernel/ptrace.c
---- linux-2.6.13.1.org/arch/cris/kernel/ptrace.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/cris/kernel/ptrace.c 2005-08-30 00:59:40.000000000
+0200
-@@ -8,6 +8,9 @@
- * Authors: Bjorn Wesen
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.10 2004/09/22 11:50:01 orjanf
- * * Moved get_reg/put_reg to arch-specific files.
- * * Added functions to access debug registers (CRISv32).
-diff -Nur linux-2.6.13.1.org/arch/cris/mm/fault.c
grsecurity226/arch/cris/mm/fault.c
---- linux-2.6.13.1.org/arch/cris/mm/fault.c 2005-09-10 04:42:58.000000000
+0200
-+++ grsecurity226/arch/cris/mm/fault.c 2005-08-30 00:59:40.000000000 +0200
-@@ -6,6 +6,9 @@
- * Authors: Bjorn Wesen
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.20 2005/03/04 08:16:18 starvik
- * Merge of Linux 2.6.11.
- *
-diff -Nur linux-2.6.13.1.org/arch/cris/mm/init.c
grsecurity226/arch/cris/mm/init.c
---- linux-2.6.13.1.org/arch/cris/mm/init.c 2005-09-10 04:42:58.000000000
+0200
-+++ grsecurity226/arch/cris/mm/init.c 2005-08-30 00:59:40.000000000 +0200
-@@ -7,6 +7,9 @@
- * Authors: Bjorn Wesen ([EMAIL PROTECTED])
- *
- * $Log$
- * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
- * - initial
- * NFY
- *
-+ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
-+ * Initial import of Linux 2.6.13
-+ *
- * Revision 1.11 2004/05/28 09:28:56 starvik
- * Calculation of loops_per_usec moved because initalization order has
changed
- * in Linux 2.6.
-diff -Nur linux-2.6.13.1.org/arch/i386/Kconfig grsecurity226/arch/i386/Kconfig
---- linux-2.6.13.1.org/arch/i386/Kconfig 2005-09-10 04:42:58.000000000
+0200
-+++ grsecurity226/arch/i386/Kconfig 2005-08-30 01:12:43.000000000 +0200
-@@ -414,7 +414,7 @@
-
- config X86_ALIGNMENT_16
- bool
-- depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII ||
X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-+ depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII ||
X86_ELAN || MK8 || MK7 || MK6 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686
|| M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
- default y
-
- config X86_GOOD_APIC
-diff -Nur linux-2.6.13.1.org/arch/i386/boot/compressed/head.S
grsecurity226/arch/i386/boot/compressed/head.S
---- linux-2.6.13.1.org/arch/i386/boot/compressed/head.S 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/i386/boot/compressed/head.S 2005-08-30
01:12:45.000000000 +0200
+diff -uNr linux-2.6.13.1.org/arch/i386/boot/compressed/head.S
grsecurity226/arch/i386/boot/compressed/head.S
+--- linux-2.6.13.1.org/arch/i386/boot/compressed/head.S 2005-09-17
03:02:12.000000000 +0200
++++ grsecurity226/arch/i386/boot/compressed/head.S 2005-09-19
03:20:21.000000000 +0200
@@ -39,11 +39,13 @@
movl %eax,%gs
@@ -699,9 +263,21 @@
/*
* Initialize eflags. Some BIOS's leave bits like NT set. This would
-diff -Nur linux-2.6.13.1.org/arch/i386/kernel/apm.c
grsecurity226/arch/i386/kernel/apm.c
---- linux-2.6.13.1.org/arch/i386/kernel/apm.c 2005-09-10 04:42:58.000000000
+0200
-+++ grsecurity226/arch/i386/kernel/apm.c 2005-08-30 01:12:47.000000000
+0200
+diff -uNr linux-2.6.13.1.org/arch/i386/Kconfig grsecurity226/arch/i386/Kconfig
+--- linux-2.6.13.1.org/arch/i386/Kconfig 2005-09-19 03:17:03.000000000
+0200
++++ grsecurity226/arch/i386/Kconfig 2005-09-19 03:20:21.000000000 +0200
+@@ -414,7 +414,7 @@
+
+ config X86_ALIGNMENT_16
+ bool
+- depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII ||
X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
++ depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII ||
X86_ELAN || MK8 || MK7 || MK6 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686
|| M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
+ default y
+
+ config X86_GOOD_APIC
+diff -uNr linux-2.6.13.1.org/arch/i386/kernel/apm.c
grsecurity226/arch/i386/kernel/apm.c
+--- linux-2.6.13.1.org/arch/i386/kernel/apm.c 2005-09-19 03:17:03.000000000
+0200
++++ grsecurity226/arch/i386/kernel/apm.c 2005-09-19 03:20:21.000000000
+0200
@@ -598,19 +598,39 @@
int cpu;
struct desc_struct save_desc_40;
@@ -790,7 +366,7 @@
put_cpu();
apm_restore_cpus(cpus);
return error;
-@@ -2295,35 +2334,35 @@
+@@ -2300,35 +2339,35 @@
apm_bios_entry.segment = APM_CS;
for (i = 0; i < NR_CPUS; i++) {
@@ -837,9 +413,9 @@
printk(KERN_NOTICE "apm: we set the granularity
of dseg.\n");
}
}
-diff -Nur linux-2.6.13.1.org/arch/i386/kernel/cpu/common.c
grsecurity226/arch/i386/kernel/cpu/common.c
---- linux-2.6.13.1.org/arch/i386/kernel/cpu/common.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/i386/kernel/cpu/common.c 2005-08-30
01:12:50.000000000 +0200
+diff -uNr linux-2.6.13.1.org/arch/i386/kernel/cpu/common.c
grsecurity226/arch/i386/kernel/cpu/common.c
+--- linux-2.6.13.1.org/arch/i386/kernel/cpu/common.c 2005-09-17
03:02:12.000000000 +0200
++++ grsecurity226/arch/i386/kernel/cpu/common.c 2005-09-19
03:20:21.000000000 +0200
@@ -18,8 +18,7 @@
#include "cpu.h"
@@ -909,9 +485,9 @@
/* Set up doublefault TSS pointer in the GDT */
__set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss);
-diff -Nur linux-2.6.13.1.org/arch/i386/kernel/cpu/mtrr/if.c
grsecurity226/arch/i386/kernel/cpu/mtrr/if.c
---- linux-2.6.13.1.org/arch/i386/kernel/cpu/mtrr/if.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/i386/kernel/cpu/mtrr/if.c 2005-08-30
01:12:52.000000000 +0200
+diff -uNr linux-2.6.13.1.org/arch/i386/kernel/cpu/mtrr/if.c
grsecurity226/arch/i386/kernel/cpu/mtrr/if.c
+--- linux-2.6.13.1.org/arch/i386/kernel/cpu/mtrr/if.c 2005-09-17
03:02:12.000000000 +0200
++++ grsecurity226/arch/i386/kernel/cpu/mtrr/if.c 2005-09-19
03:20:21.000000000 +0200
@@ -105,7 +105,7 @@
if (!len)
return -EINVAL;
@@ -921,9 +497,9 @@
len = LINE_SIZE;
if (copy_from_user(line, buf, len - 1))
return -EFAULT;
-diff -Nur linux-2.6.13.1.org/arch/i386/kernel/entry.S
grsecurity226/arch/i386/kernel/entry.S
---- linux-2.6.13.1.org/arch/i386/kernel/entry.S 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/i386/kernel/entry.S 2005-08-30 01:12:47.000000000
+0200
+diff -uNr linux-2.6.13.1.org/arch/i386/kernel/entry.S
grsecurity226/arch/i386/kernel/entry.S
+--- linux-2.6.13.1.org/arch/i386/kernel/entry.S 2005-09-17
03:02:12.000000000 +0200
++++ grsecurity226/arch/i386/kernel/entry.S 2005-09-19 03:20:21.000000000
+0200
@@ -213,6 +213,13 @@
movl TI_flags(%ebp), %ecx
testw $_TIF_ALLWORK_MASK, %cx
@@ -949,9 +525,9 @@
restore_all:
movl EFLAGS(%esp), %eax # mix EFLAGS, SS and CS
# Warning: OLDSS(%esp) contains the wrong/random values if we
-diff -Nur linux-2.6.13.1.org/arch/i386/kernel/head.S
grsecurity226/arch/i386/kernel/head.S
---- linux-2.6.13.1.org/arch/i386/kernel/head.S 2005-09-10 04:42:58.000000000
+0200
-+++ grsecurity226/arch/i386/kernel/head.S 2005-08-30 01:12:47.000000000
+0200
+diff -uNr linux-2.6.13.1.org/arch/i386/kernel/head.S
grsecurity226/arch/i386/kernel/head.S
+--- linux-2.6.13.1.org/arch/i386/kernel/head.S 2005-09-17 03:02:12.000000000
+0200
++++ grsecurity226/arch/i386/kernel/head.S 2005-09-19 03:20:21.000000000
+0200
@@ -48,6 +48,12 @@
@@ -1257,9 +833,9 @@
+#ifdef CONFIG_SMP
+ .fill (NR_CPUS-1)*GDT_ENTRIES,8,0 /* other CPU's GDT */
+#endif
-diff -Nur linux-2.6.13.1.org/arch/i386/kernel/init_task.c
grsecurity226/arch/i386/kernel/init_task.c
---- linux-2.6.13.1.org/arch/i386/kernel/init_task.c 2005-09-10
04:42:58.000000000 +0200
-+++ grsecurity226/arch/i386/kernel/init_task.c 2005-08-30 01:12:47.000000000
+0200
+diff -uNr linux-2.6.13.1.org/arch/i386/kernel/init_task.c
grsecurity226/arch/i386/kernel/init_task.c
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6.13.1-grsec.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
