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-05-23 14:55:33.000000000 +0900 |
+++ linux-2.6.21-ccs/fs/proc/proc_misc.c 2007-07-10 09:03:54.355527272 +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/05/24\n"); |
+ printk("Hook version: 2.6.21 2007/07/10\n"); |
556 |
+ } |
+ } |
557 |
+#endif |
+#endif |
558 |
+ /***** CCS end. *****/ |
+ /***** CCS end. *****/ |
597 |
}; |
}; |
598 |
|
|
599 |
static inline pid_t process_group(struct task_struct *tsk) |
static inline pid_t process_group(struct task_struct *tsk) |
600 |
|
diff -ubBpEr linux-2.6.21/kernel/compat.c linux-2.6.21-ccs/kernel/compat.c |
601 |
|
--- linux-2.6.21/kernel/compat.c 2007-04-26 12:08:32.000000000 +0900 |
602 |
|
+++ linux-2.6.21-ccs/kernel/compat.c 2007-07-10 09:02:19.563937784 +0900 |
603 |
|
@@ -25,6 +25,9 @@ |
604 |
|
#include <linux/posix-timers.h> |
605 |
|
|
606 |
|
#include <asm/uaccess.h> |
607 |
|
+/***** TOMOYO Linux start. *****/ |
608 |
|
+#include <linux/tomoyo.h> |
609 |
|
+/***** TOMOYO Linux end. *****/ |
610 |
|
|
611 |
|
int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts) |
612 |
|
{ |
613 |
|
@@ -869,6 +872,9 @@ asmlinkage long compat_sys_stime(compat_ |
614 |
|
err = security_settime(&tv, NULL); |
615 |
|
if (err) |
616 |
|
return err; |
617 |
|
+ /***** TOMOYO Linux start. *****/ |
618 |
|
+ if (CheckCapabilityACL(TOMOYO_SYS_SETTIME)) return -EPERM; |
619 |
|
+ /***** TOMOYO Linux end. *****/ |
620 |
|
|
621 |
|
do_settimeofday(&tv); |
622 |
|
return 0; |
623 |
diff -ubBpEr linux-2.6.21/kernel/kexec.c linux-2.6.21-ccs/kernel/kexec.c |
diff -ubBpEr linux-2.6.21/kernel/kexec.c linux-2.6.21-ccs/kernel/kexec.c |
624 |
--- linux-2.6.21/kernel/kexec.c 2007-04-28 04:02:41.000000000 +0900 |
--- linux-2.6.21/kernel/kexec.c 2007-04-28 04:02:41.000000000 +0900 |
625 |
+++ linux-2.6.21-ccs/kernel/kexec.c 2007-04-28 04:02:47.000000000 +0900 |
+++ linux-2.6.21-ccs/kernel/kexec.c 2007-04-28 04:02:47.000000000 +0900 |