Open-Source-Software-Entwicklung und Downloads

TOMOYO

Browse Subversion Repository

/[tomoyo]/trunk/ccs-patch/ccs-patch-2.6.18-8.1.6.el5.txt

Diff of /trunk/ccs-patch/ccs-patch-2.6.18-8.1.6.el5.txt

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 289 by kumaneko, Mon Jun 18 12:36:43 2007 UTC revision 290 by kumaneko, Tue Jul 10 11:52:21 2007 UTC
# Line 545  diff -ubBpEr linux-2.6.18-8.1.6.el5/fs/p Line 545  diff -ubBpEr linux-2.6.18-8.1.6.el5/fs/p
545  +proc-$(CONFIG_TOMOYO) += ccs_proc.o  +proc-$(CONFIG_TOMOYO) += ccs_proc.o
546  diff -ubBpEr linux-2.6.18-8.1.6.el5/fs/proc/proc_misc.c linux-2.6.18-8.1.6.el5-ccs/fs/proc/proc_misc.c  diff -ubBpEr linux-2.6.18-8.1.6.el5/fs/proc/proc_misc.c linux-2.6.18-8.1.6.el5-ccs/fs/proc/proc_misc.c
547  --- linux-2.6.18-8.1.6.el5/fs/proc/proc_misc.c  2007-06-17 20:58:16.000000000 +0900  --- linux-2.6.18-8.1.6.el5/fs/proc/proc_misc.c  2007-06-17 20:58:16.000000000 +0900
548  +++ linux-2.6.18-8.1.6.el5-ccs/fs/proc/proc_misc.c      2007-06-17 20:59:20.000000000 +0900  +++ linux-2.6.18-8.1.6.el5-ccs/fs/proc/proc_misc.c      2007-07-10 12:12:15.000000000 +0900
549  @@ -723,4 +723,13 @@ void __init proc_misc_init(void)  @@ -723,4 +723,13 @@ void __init proc_misc_init(void)
550          if (entry)          if (entry)
551                  entry->proc_fops = &proc_sysrq_trigger_operations;                  entry->proc_fops = &proc_sysrq_trigger_operations;
# Line 555  diff -ubBpEr linux-2.6.18-8.1.6.el5/fs/p Line 555  diff -ubBpEr linux-2.6.18-8.1.6.el5/fs/p
555  +       {  +       {
556  +               extern void __init CCSProc_Init(void);  +               extern void __init CCSProc_Init(void);
557  +               CCSProc_Init();  +               CCSProc_Init();
558  +               printk("Hook version: 2.6.18-8.1.6.el5 2007/06/18\n");  +               printk("Hook version: 2.6.18-8.1.6.el5 2007/07/10\n");
559  +       }  +       }
560  +#endif  +#endif
561  +       /***** CCS end. *****/  +       /***** CCS end. *****/
562   }   }
563  diff -ubBpEr linux-2.6.18-8.1.6.el5/fs/syaoran_2.6.c linux-2.6.18-8.1.6.el5-ccs/fs/syaoran_2.6.c  diff -ubBpEr linux-2.6.18-8.1.6.el5/fs/syaoran_2.6.c linux-2.6.18-8.1.6.el5-ccs/fs/syaoran_2.6.c
564  --- linux-2.6.18-8.1.6.el5/fs/syaoran_2.6.c     2007-06-17 20:58:16.000000000 +0900  --- linux-2.6.18-8.1.6.el5/fs/syaoran_2.6.c     2007-07-05 12:00:00.000000000 +0900
565  +++ linux-2.6.18-8.1.6.el5-ccs/fs/syaoran_2.6.c 2007-06-17 20:58:21.000000000 +0900  +++ linux-2.6.18-8.1.6.el5-ccs/fs/syaoran_2.6.c 2007-07-10 12:11:20.000000000 +0900
566  @@ -79,7 +79,7 @@ struct inode *syaoran_get_inode(struct s  @@ -79,7 +79,7 @@ struct inode *syaoran_get_inode(struct s
567                  inode->i_mode = mode;                  inode->i_mode = mode;
568                  inode->i_uid = current->fsuid;                  inode->i_uid = current->fsuid;
# Line 613  diff -ubBpEr linux-2.6.18-8.1.6.el5/incl Line 613  diff -ubBpEr linux-2.6.18-8.1.6.el5/incl
613    
614   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
615  diff -ubBpEr linux-2.6.18-8.1.6.el5/include/linux/syaoran.h linux-2.6.18-8.1.6.el5-ccs/include/linux/syaoran.h  diff -ubBpEr linux-2.6.18-8.1.6.el5/include/linux/syaoran.h linux-2.6.18-8.1.6.el5-ccs/include/linux/syaoran.h
616  --- linux-2.6.18-8.1.6.el5/include/linux/syaoran.h      2007-06-17 20:58:16.000000000 +0900  --- linux-2.6.18-8.1.6.el5/include/linux/syaoran.h      2007-07-05 12:00:00.000000000 +0900
617  +++ linux-2.6.18-8.1.6.el5-ccs/include/linux/syaoran.h  2007-06-17 20:58:21.000000000 +0900  +++ linux-2.6.18-8.1.6.el5-ccs/include/linux/syaoran.h  2007-07-10 12:11:20.000000000 +0900
618  @@ -831,7 +831,7 @@ static int syaoran_create_tracelog(struc  @@ -831,7 +831,7 @@ static int syaoran_create_tracelog(struc
619                          inode->i_mode = S_IFREG | 0400;                          inode->i_mode = S_IFREG | 0400;
620                          inode->i_uid = 0;                          inode->i_uid = 0;
# Line 624  diff -ubBpEr linux-2.6.18-8.1.6.el5/incl Line 624  diff -ubBpEr linux-2.6.18-8.1.6.el5/incl
624                          inode->i_blksize = PAGE_CACHE_SIZE;                          inode->i_blksize = PAGE_CACHE_SIZE;
625   #endif   #endif
626                          inode->i_blocks = 0;                          inode->i_blocks = 0;
627    diff -ubBpEr linux-2.6.18-8.1.6.el5/kernel/compat.c linux-2.6.18-8.1.6.el5-ccs/kernel/compat.c
628    --- linux-2.6.18-8.1.6.el5/kernel/compat.c      2006-09-20 12:42:06.000000000 +0900
629    +++ linux-2.6.18-8.1.6.el5-ccs/kernel/compat.c  2007-07-10 12:12:01.000000000 +0900
630    @@ -24,6 +24,9 @@
631     #include <linux/migrate.h>
632    
633     #include <asm/uaccess.h>
634    +/***** TOMOYO Linux start. *****/
635    +#include <linux/tomoyo.h>
636    +/***** TOMOYO Linux end. *****/
637    
638     int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
639     {
640    @@ -836,6 +839,9 @@ asmlinkage long compat_sys_stime(compat_
641            err = security_settime(&tv, NULL);
642            if (err)
643                    return err;
644    +       /***** TOMOYO Linux start. *****/
645    +       if (CheckCapabilityACL(TOMOYO_SYS_SETTIME)) return -EPERM;
646    +       /***** TOMOYO Linux end. *****/
647    
648            do_settimeofday(&tv);
649            return 0;
650  diff -ubBpEr linux-2.6.18-8.1.6.el5/kernel/kexec.c linux-2.6.18-8.1.6.el5-ccs/kernel/kexec.c  diff -ubBpEr linux-2.6.18-8.1.6.el5/kernel/kexec.c linux-2.6.18-8.1.6.el5-ccs/kernel/kexec.c
651  --- linux-2.6.18-8.1.6.el5/kernel/kexec.c       2007-06-17 20:58:16.000000000 +0900  --- linux-2.6.18-8.1.6.el5/kernel/kexec.c       2007-06-17 20:58:16.000000000 +0900
652  +++ linux-2.6.18-8.1.6.el5-ccs/kernel/kexec.c   2007-06-17 20:58:21.000000000 +0900  +++ linux-2.6.18-8.1.6.el5-ccs/kernel/kexec.c   2007-06-17 20:58:21.000000000 +0900
Legend:
Removed from v.289  
changed lines
  Added in v.290
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
Über OSDN
Software suchen
Entwickeln Software
Hilfeseiten