ppc fix for real

1 files changed, 75 insertions, 77 deletions

diff --git a/src/kernel/hardened-patches/hardened-patches-2.6-7.2/3000_netdev-random-core-2.6.7.patch b/src/kernel/hardened-patches/hardened-patches-2.6-7.2/3000_netdev-random-core-2.6.7.patch
index cae355eb5e..34377c1963 100644
--- a/src/kernel/hardened-patches/hardened-patches-2.6-7.2/3000_netdev-random-core-2.6.7.patch
+++ b/src/kernel/hardened-patches/hardened-patches-2.6-7.2/3000_netdev-random-core-2.6.7.patch
@@ -1,7 +1,7 @@
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/drivers/net/Kconfig linux-2.6.7-netdev_random/drivers/net/Kconfig
---- /home/albeiro/src/rsbac/linux-2.6.7/drivers/net/Kconfig	2004-06-16 07:19:52.000000000 +0200
-+++ linux-2.6.7-netdev_random/drivers/net/Kconfig	2004-06-23 23:16:46.124597472 +0200
-@@ -104,6 +104,22 @@ config TUN
+diff -urN /usr/src/linux-2.6.7-hardened/drivers/net/Kconfig linux-2.6.7-hardened/drivers/net/Kconfig
+--- /usr/src/linux-2.6.7-hardened/drivers/net/Kconfig	2004-06-30 01:11:09.536167840 -0400
++++ linux-2.6.7-hardened/drivers/net/Kconfig	2004-06-29 17:47:26.000000000 -0400
+@@ -104,6 +104,22 @@
  
  	  If you don't know what to use this for, you don't need it.
  
@@ -24,10 +24,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/drivers/net/Kconfig l
  config ETHERTAP
  	tristate "Ethertap network tap"
  	depends on NETDEVICES && EXPERIMENTAL && NETLINK_DEV
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-alpha/signal.h linux-2.6.7-netdev_random/include/asm-alpha/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-alpha/signal.h	2004-06-16 07:19:23.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-alpha/signal.h	2004-06-23 23:16:46.133596104 +0200
-@@ -121,8 +121,15 @@ typedef unsigned long sigset_t;
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-alpha/signal.h linux-2.6.7-hardened/include/asm-alpha/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-alpha/signal.h	2004-06-30 01:11:09.537167688 -0400
++++ linux-2.6.7-hardened/include/asm-alpha/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -121,8 +121,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x40000000
@@ -43,10 +43,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-alpha/sig
  #define SIG_BLOCK          1	/* for blocking signals */
  #define SIG_UNBLOCK        2	/* for unblocking signals */
  #define SIG_SETMASK        3	/* for setting the signal mask */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-arm/signal.h linux-2.6.7-netdev_random/include/asm-arm/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-arm/signal.h	2004-06-16 07:19:22.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-arm/signal.h	2004-06-23 23:16:46.141594888 +0200
-@@ -126,8 +126,15 @@ typedef unsigned long sigset_t;
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-arm/signal.h linux-2.6.7-hardened/include/asm-arm/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-arm/signal.h	2004-06-30 01:11:09.538167536 -0400
++++ linux-2.6.7-hardened/include/asm-arm/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -126,8 +126,15 @@
  #define SA_SAMPLE_RANDOM	0x10000000
  #define SA_IRQNOMASK		0x08000000
  #define SA_SHIRQ		0x04000000
@@ -62,10 +62,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-arm/signa
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-cris/signal.h linux-2.6.7-netdev_random/include/asm-cris/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-cris/signal.h	2004-06-16 07:19:52.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-cris/signal.h	2004-06-23 23:16:46.152593216 +0200
-@@ -120,8 +120,15 @@ typedef unsigned long sigset_t;
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-cris/signal.h linux-2.6.7-hardened/include/asm-cris/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-cris/signal.h	2004-06-30 01:11:09.538167536 -0400
++++ linux-2.6.7-hardened/include/asm-cris/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -120,8 +120,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -81,10 +81,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-cris/sign
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-i386/signal.h linux-2.6.7-netdev_random/include/asm-i386/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-i386/signal.h	2004-06-16 07:18:59.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-i386/signal.h	2004-06-23 23:16:46.161591848 +0200
-@@ -121,8 +121,15 @@ typedef unsigned long sigset_t;
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-i386/signal.h linux-2.6.7-hardened/include/asm-i386/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-i386/signal.h	2004-06-30 01:11:09.566163280 -0400
++++ linux-2.6.7-hardened/include/asm-i386/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -121,8 +121,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -100,9 +100,9 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-i386/sign
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-ia64/signal.h linux-2.6.7-netdev_random/include/asm-ia64/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-ia64/signal.h	2004-06-16 07:18:58.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-ia64/signal.h	2004-06-23 23:16:46.169590632 +0200
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-ia64/signal.h linux-2.6.7-hardened/include/asm-ia64/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-ia64/signal.h	2004-06-30 01:11:09.585160392 -0400
++++ linux-2.6.7-hardened/include/asm-ia64/signal.h	2004-06-29 17:47:26.000000000 -0400
 @@ -126,6 +126,12 @@
  #define SA_SHIRQ		0x04000000
  #define SA_PERCPU_IRQ		0x02000000
@@ -116,10 +116,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-ia64/sign
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK          0	/* for blocking signals */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-m68k/signal.h linux-2.6.7-netdev_random/include/asm-m68k/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-m68k/signal.h	2004-06-16 07:19:01.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-m68k/signal.h	2004-06-23 23:16:46.178589264 +0200
-@@ -116,8 +116,15 @@ typedef unsigned long sigset_t;
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-m68k/signal.h linux-2.6.7-hardened/include/asm-m68k/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-m68k/signal.h	2004-06-30 01:11:09.601157960 -0400
++++ linux-2.6.7-hardened/include/asm-m68k/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -116,8 +116,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -135,10 +135,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-m68k/sign
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-mips/signal.h linux-2.6.7-netdev_random/include/asm-mips/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-mips/signal.h	2004-06-16 07:19:10.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-mips/signal.h	2004-06-23 23:16:46.188587744 +0200
-@@ -111,6 +111,12 @@ typedef unsigned long old_sigset_t;		/* 
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-mips/signal.h linux-2.6.7-hardened/include/asm-mips/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-mips/signal.h	2004-06-30 01:11:09.617155528 -0400
++++ linux-2.6.7-hardened/include/asm-mips/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -111,6 +111,12 @@
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x02000000
  
@@ -151,9 +151,9 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-mips/sign
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK	1	/* for blocking signals */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-parisc/signal.h linux-2.6.7-netdev_random/include/asm-parisc/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-parisc/signal.h	2004-06-16 07:20:04.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-parisc/signal.h	2004-06-23 23:16:46.223582424 +0200
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-parisc/signal.h linux-2.6.7-hardened/include/asm-parisc/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-parisc/signal.h	2004-06-30 01:11:09.631153400 -0400
++++ linux-2.6.7-hardened/include/asm-parisc/signal.h	2004-06-29 17:47:26.000000000 -0400
 @@ -100,6 +100,12 @@
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -167,10 +167,27 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-parisc/si
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK          0	/* for blocking signals */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-ppc64/signal.h linux-2.6.7-netdev_random/include/asm-ppc64/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-ppc64/signal.h	2004-06-16 07:19:22.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-ppc64/signal.h	2004-06-23 23:16:46.231581208 +0200
-@@ -107,8 +107,15 @@ typedef struct {
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-ppc/signal.h linux-2.6.7-hardened/include/asm-ppc/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-ppc/signal.h	2004-06-29 17:47:26.000000000 -0400
++++ linux-2.6.7-hardened/include/asm-ppc/signal.h	2004-06-30 01:07:33.000000000 -0400
+@@ -111,6 +111,13 @@
+ #define SA_PROBE		SA_ONESHOT
+ #define SA_SAMPLE_RANDOM	SA_RESTART
+ #define SA_SHIRQ		0x04000000
++
++#ifdef CONFIG_NET_RANDOM
++#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
++#else
++#define SA_NET_RANDOM  0
++#endif
++
+ #endif /* __KERNEL__ */
+ 
+ #define SIG_BLOCK          0	/* for blocking signals */
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-ppc64/signal.h linux-2.6.7-hardened/include/asm-ppc64/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-ppc64/signal.h	2004-06-30 01:11:09.659149144 -0400
++++ linux-2.6.7-hardened/include/asm-ppc64/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -107,8 +107,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -186,10 +203,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-ppc64/sig
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-s390/signal.h linux-2.6.7-netdev_random/include/asm-s390/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-s390/signal.h	2004-06-16 07:19:43.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-s390/signal.h	2004-06-23 23:16:46.240579840 +0200
-@@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-s390/signal.h linux-2.6.7-hardened/include/asm-s390/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-s390/signal.h	2004-06-30 01:11:09.671147320 -0400
++++ linux-2.6.7-hardened/include/asm-s390/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -129,8 +129,15 @@
  #define SA_PROBE                SA_ONESHOT
  #define SA_SAMPLE_RANDOM        SA_RESTART
  #define SA_SHIRQ                0x04000000
@@ -205,10 +222,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-s390/sign
  #define SIG_BLOCK          0    /* for blocking signals */
  #define SIG_UNBLOCK        1    /* for unblocking signals */
  #define SIG_SETMASK        2    /* for setting the signal mask */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sh/signal.h linux-2.6.7-netdev_random/include/asm-sh/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sh/signal.h	2004-06-16 07:19:36.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-sh/signal.h	2004-06-23 23:16:46.257577256 +0200
-@@ -120,8 +120,15 @@ typedef unsigned long sigset_t;
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-sh/signal.h linux-2.6.7-hardened/include/asm-sh/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-sh/signal.h	2004-06-30 01:11:09.687144888 -0400
++++ linux-2.6.7-hardened/include/asm-sh/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -120,8 +120,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -224,10 +241,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sh/signal
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sparc/signal.h linux-2.6.7-netdev_random/include/asm-sparc/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sparc/signal.h	2004-06-16 07:19:36.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-sparc/signal.h	2004-06-23 23:16:46.268575584 +0200
-@@ -176,8 +176,15 @@ struct sigstack {
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-sparc/signal.h linux-2.6.7-hardened/include/asm-sparc/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-sparc/signal.h	2004-06-30 01:11:09.720139872 -0400
++++ linux-2.6.7-hardened/include/asm-sparc/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -176,8 +176,15 @@
  #define SA_PROBE SA_ONESHOT
  #define SA_SAMPLE_RANDOM SA_RESTART
  #define SA_STATIC_ALLOC		0x80
@@ -243,10 +260,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sparc/sig
  /* Type of a signal handler.  */
  #ifdef __KERNEL__
  typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sparc64/signal.h linux-2.6.7-netdev_random/include/asm-sparc64/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sparc64/signal.h	2004-06-16 07:19:02.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-sparc64/signal.h	2004-06-23 23:16:46.278574064 +0200
-@@ -182,8 +182,15 @@ struct sigstack {
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-sparc64/signal.h linux-2.6.7-hardened/include/asm-sparc64/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-sparc64/signal.h	2004-06-30 01:11:09.731138200 -0400
++++ linux-2.6.7-hardened/include/asm-sparc64/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -182,8 +182,15 @@
  #define SA_PROBE SA_ONESHOT
  #define SA_SAMPLE_RANDOM SA_RESTART
  #define SA_STATIC_ALLOC		0x80
@@ -262,10 +279,10 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-sparc64/s
  /* Type of a signal handler.  */
  #ifdef __KERNEL__
  typedef void (*__sighandler_t)(int, struct sigcontext *);
-diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-x86_64/signal.h linux-2.6.7-netdev_random/include/asm-x86_64/signal.h
---- /home/albeiro/src/rsbac/linux-2.6.7/include/asm-x86_64/signal.h	2004-06-16 07:18:52.000000000 +0200
-+++ linux-2.6.7-netdev_random/include/asm-x86_64/signal.h	2004-06-23 23:16:46.288572544 +0200
-@@ -128,8 +128,15 @@ typedef unsigned long sigset_t;
+diff -urN /usr/src/linux-2.6.7-hardened/include/asm-x86_64/signal.h linux-2.6.7-hardened/include/asm-x86_64/signal.h
+--- /usr/src/linux-2.6.7-hardened/include/asm-x86_64/signal.h	2004-06-30 01:11:09.753134856 -0400
++++ linux-2.6.7-hardened/include/asm-x86_64/signal.h	2004-06-29 17:47:26.000000000 -0400
+@@ -128,8 +128,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -281,22 +298,3 @@ diff -uprN -X dontdiff /home/albeiro/src/rsbac/linux-2.6.7/include/asm-x86_64/si
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
  #define SIG_SETMASK        2	/* for setting the signal mask */
-
-diff -ruN /usr/src/linux-2.6.7-hardened/include/asm-ppc/signal.h linux-2.6.7-hardened/include/asm-ppc/signal.h
---- /usr/src/linux-2.6.7-hardened/include/asm-ppc/signal.h  2004-06-29 17:47:26.000000000 -0400
-+++ linux-2.6.7-hardened/include/asm-ppc/signal.h   2004-06-30 00:24:14.599103320 -0400
-@@ -111,6 +111,13 @@
- #define SA_PROBE       SA_ONESHOT
- #define SA_SAMPLE_RANDOM   SA_RESTART
- #define SA_SHIRQ       0x04000000
-+
-+#ifdef CONFIG_NET_RANDOM
-+#define SA_NET_RANDOM  SA_SAMPLE_RANDOM
-+#else
-+#define SA_NET_RANDOM  0
-+#endif
-+
- #endif /* __KERNEL__ */
-
- #define SIG_BLOCK          0   /* for blocking signals */
-