オープンソース・ソフトウェアの開発とダウンロード

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/trunk/1.8.x/ccs-patch/patches/ccs-patch-2.4.37.diff

Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.4.37.diff

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

revision 2922 by kumaneko, Wed Aug 19 04:26:56 2009 UTC revision 2926 by kumaneko, Thu Aug 20 03:13:40 2009 UTC
# Line 33  Source code for this patch is http://www Line 33  Source code for this patch is http://www
33   fs/namespace.c               |   30 +++++++++++++++++++++++++++++-   fs/namespace.c               |   30 +++++++++++++++++++++++++++++-
34   fs/open.c                    |   27 +++++++++++++++++++++++++++   fs/open.c                    |   27 +++++++++++++++++++++++++++
35   fs/proc/proc_misc.c          |    1 +   fs/proc/proc_misc.c          |    1 +
36   include/linux/sched.h        |    6 ++++++   include/linux/sched.h        |   14 ++++++++++++++
37   kernel/kmod.c                |    3 +++   kernel/kmod.c                |    5 +++++
38   kernel/module.c              |    7 +++++++   kernel/module.c              |    7 +++++++
39   kernel/sched.c               |    3 +++   kernel/sched.c               |    3 +++
40   kernel/signal.c              |    7 +++++++   kernel/signal.c              |    7 +++++++
# Line 49  Source code for this patch is http://www Line 49  Source code for this patch is http://www
49   net/ipv6/udp.c               |    8 ++++++++   net/ipv6/udp.c               |    8 ++++++++
50   net/socket.c                 |   25 +++++++++++++++++++++++--   net/socket.c                 |   25 +++++++++++++++++++++++--
51   net/unix/af_unix.c           |    4 ++++   net/unix/af_unix.c           |    4 ++++
52   47 files changed, 313 insertions(+), 5 deletions(-)   47 files changed, 323 insertions(+), 5 deletions(-)
53    
54  --- linux-2.4.37.5.orig/arch/alpha/kernel/ptrace.c  --- linux-2.4.37.5.orig/arch/alpha/kernel/ptrace.c
55  +++ linux-2.4.37.5/arch/alpha/kernel/ptrace.c  +++ linux-2.4.37.5/arch/alpha/kernel/ptrace.c
# Line 944  Source code for this patch is http://www Line 944  Source code for this patch is http://www
944                          entry->proc_fops = &ppc_htab_operations;                          entry->proc_fops = &ppc_htab_operations;
945          }          }
946   #endif   #endif
947  +       printk(KERN_INFO "Hook version: 2.4.37.5 2009/08/14\n");  +       printk(KERN_INFO "Hook version: 2.4.37.5 2009/08/20\n");
948   }   }
949  --- linux-2.4.37.5.orig/include/linux/sched.h  --- linux-2.4.37.5.orig/include/linux/sched.h
950  +++ linux-2.4.37.5/include/linux/sched.h  +++ linux-2.4.37.5/include/linux/sched.h
951  @@ -29,6 +29,8 @@ extern unsigned long event;  @@ -29,6 +29,15 @@ extern unsigned long event;
952    
953   struct exec_domain;   struct exec_domain;
954    
955    +#ifdef CONFIG_CCSECURITY
956  +struct ccs_domain_info;  +struct ccs_domain_info;
957    +#define INIT_CCSECURITY          \
958    +       .ccs_domain_info = NULL, \
959    +       .ccs_flags = 0,
960    +#else
961    +#define INIT_CCSECURITY
962    +#endif
963  +  +
964   /*   /*
965    * cloning flags:    * cloning flags:
966    */    */
967  @@ -417,6 +419,8 @@ struct task_struct {  @@ -417,6 +426,10 @@ struct task_struct {
968          void *journal_info;          void *journal_info;
969    
970          struct list_head *scm_work_list;          struct list_head *scm_work_list;
971    +#ifdef CONFIG_CCSECURITY
972  +       struct ccs_domain_info *ccs_domain_info;  +       struct ccs_domain_info *ccs_domain_info;
973  +       u32 ccs_flags;  +       u32 ccs_flags;
974    +#endif
975   };   };
976    
977   /*   /*
978  @@ -512,6 +516,8 @@ extern struct exec_domain   default_exec_d  @@ -512,6 +525,7 @@ extern struct exec_domain   default_exec_d
979       blocked:           {{0}},                                          \       blocked:           {{0}},                                          \
980       alloc_lock:                SPIN_LOCK_UNLOCKED,                             \       alloc_lock:                SPIN_LOCK_UNLOCKED,                             \
981       journal_info:      NULL,                                           \       journal_info:      NULL,                                           \
982  +       ccs_domain_info: NULL,            \  +       INIT_CCSECURITY                                                 \
 +       ccs_flags: 0                      \  
983   }   }
984    
985    
986  --- linux-2.4.37.5.orig/kernel/kmod.c  --- linux-2.4.37.5.orig/kernel/kmod.c
987  +++ linux-2.4.37.5/kernel/kmod.c  +++ linux-2.4.37.5/kernel/kmod.c
988  @@ -134,6 +134,9 @@ int exec_usermodehelper(char *program_pa  @@ -134,6 +134,11 @@ int exec_usermodehelper(char *program_pa
989          /* Allow execve args to be in kernel space. */          /* Allow execve args to be in kernel space. */
990          set_fs(KERNEL_DS);          set_fs(KERNEL_DS);
991    
992    +#ifdef CONFIG_CCSECURITY
993  +       current->ccs_domain_info = NULL;  +       current->ccs_domain_info = NULL;
994  +       current->ccs_flags = 0;  +       current->ccs_flags = 0;
995    +#endif
996  +  +
997          /* Go, go, go... */          /* Go, go, go... */
998          if (execve(program_path, argv, envp) < 0)          if (execve(program_path, argv, envp) < 0)
Legend:
Removed from v.2922  
changed lines
  Added in v.2926
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ