542 |
+proc-$(CONFIG_TOMOYO) += ccs_proc.o |
+proc-$(CONFIG_TOMOYO) += ccs_proc.o |
543 |
diff -ubBpEr linux-2.6.21/fs/proc/proc_misc.c linux-2.6.21-ccs/fs/proc/proc_misc.c |
diff -ubBpEr linux-2.6.21/fs/proc/proc_misc.c linux-2.6.21-ccs/fs/proc/proc_misc.c |
544 |
--- linux-2.6.21/fs/proc/proc_misc.c 2007-04-28 04:02:41.000000000 +0900 |
--- linux-2.6.21/fs/proc/proc_misc.c 2007-04-28 04:02:41.000000000 +0900 |
545 |
+++ linux-2.6.21-ccs/fs/proc/proc_misc.c 2007-07-10 09:03:54.000000000 +0900 |
+++ linux-2.6.21-ccs/fs/proc/proc_misc.c 2007-08-15 08:47:17.903847192 +0900 |
546 |
@@ -747,4 +747,13 @@ void __init proc_misc_init(void) |
@@ -747,4 +747,13 @@ void __init proc_misc_init(void) |
547 |
entry->proc_fops = &proc_sysrq_trigger_operations; |
entry->proc_fops = &proc_sysrq_trigger_operations; |
548 |
} |
} |
552 |
+ { |
+ { |
553 |
+ extern void __init CCSProc_Init(void); |
+ extern void __init CCSProc_Init(void); |
554 |
+ CCSProc_Init(); |
+ CCSProc_Init(); |
555 |
+ printk("Hook version: 2.6.21 2007/08/14\n"); |
+ printk("Hook version: 2.6.21 2007/08/15\n"); |
556 |
+ } |
+ } |
557 |
+#endif |
+#endif |
558 |
+ /***** CCS end. *****/ |
+ /***** CCS end. *****/ |
976 |
/* SMP safe, global irq locking makes it work. */ |
/* SMP safe, global irq locking makes it work. */ |
977 |
diff -ubBpEr linux-2.6.21/net/core/datagram.c linux-2.6.21-ccs/net/core/datagram.c |
diff -ubBpEr linux-2.6.21/net/core/datagram.c linux-2.6.21-ccs/net/core/datagram.c |
978 |
--- linux-2.6.21/net/core/datagram.c 2007-04-26 12:08:32.000000000 +0900 |
--- linux-2.6.21/net/core/datagram.c 2007-04-26 12:08:32.000000000 +0900 |
979 |
+++ linux-2.6.21-ccs/net/core/datagram.c 2007-08-14 10:55:26.000000000 +0900 |
+++ linux-2.6.21-ccs/net/core/datagram.c 2007-08-15 08:45:23.345262744 +0900 |
980 |
@@ -56,6 +56,11 @@ |
@@ -56,6 +56,11 @@ |
981 |
#include <net/sock.h> |
#include <net/sock.h> |
982 |
#include <net/tcp_states.h> |
#include <net/tcp_states.h> |
996 |
+ /***** TOMOYO Linux start. *****/ |
+ /***** TOMOYO Linux start. *****/ |
997 |
+ error = CheckSocketRecvDatagramPermission(sk, skb); |
+ error = CheckSocketRecvDatagramPermission(sk, skb); |
998 |
+ if (error) { |
+ if (error) { |
999 |
+ skb_kill_datagram(sk, skb, flags); |
+ skb_free_datagram(sk, skb); |
1000 |
+ goto no_packet; |
+ goto no_packet; |
1001 |
+ } |
+ } |
1002 |
+ /***** TOMOYO Linux end. *****/ |
+ /***** TOMOYO Linux end. *****/ |