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

Subversion リポジトリの参照

Diff of /trunk/1.7.x/ccs-patch/security/ccsecurity/util.c

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

revision 1280 by kumaneko, Tue Jun 10 05:22:12 2008 UTC revision 1283 by kumaneko, Wed Jun 11 01:45:23 2008 UTC
# Line 5  Line 5 
5   *   *
6   * Copyright (C) 2005-2008  NTT DATA CORPORATION   * Copyright (C) 2005-2008  NTT DATA CORPORATION
7   *   *
8   * Version: 1.6.2-pre   2008/06/10   * Version: 1.6.2-pre   2008/06/11
9   *   *
10   * This file is applicable to both 2.4.30 and 2.6.11 and later.   * This file is applicable to both 2.4.30 and 2.6.11 and later.
11   * See README.ccs for ChangeLog.   * See README.ccs for ChangeLog.
# Line 94  static struct { Line 94  static struct {
94          [CCS_TOMOYO_MAX_REJECT_LOG]          [CCS_TOMOYO_MAX_REJECT_LOG]
95          = { "MAX_REJECT_LOG",      MAX_REJECT_LOG, INT_MAX },          = { "MAX_REJECT_LOG",      MAX_REJECT_LOG, INT_MAX },
96          [CCS_TOMOYO_VERBOSE]             = { "TOMOYO_VERBOSE",      1, 1 },          [CCS_TOMOYO_VERBOSE]             = { "TOMOYO_VERBOSE",      1, 1 },
         [CCS_ALLOW_ENFORCE_GRACE]        = { "ALLOW_ENFORCE_GRACE", 0, 1 },  
97          [CCS_SLEEP_PERIOD]          [CCS_SLEEP_PERIOD]
98          = { "SLEEP_PERIOD",        0, 3000 }, /* in 0.1 second */          = { "SLEEP_PERIOD",        0, 3000 }, /* in 0.1 second */
99  };  };
# Line 1126  static int write_profile(struct ccs_io_b Line 1125  static int write_profile(struct ccs_io_b
1125                          switch (i) {                          switch (i) {
1126                          case CCS_SAKURA_RESTRICT_AUTOBIND:                          case CCS_SAKURA_RESTRICT_AUTOBIND:
1127                          case CCS_TOMOYO_VERBOSE:                          case CCS_TOMOYO_VERBOSE:
                         case CCS_ALLOW_ENFORCE_GRACE:  
1128                                  modes = mode_2;                                  modes = mode_2;
1129                                  break;                                  break;
1130                          default:                          default:
# Line 2394  void ccs_load_policy(const char *filenam Line 2392  void ccs_load_policy(const char *filenam
2392          }          }
2393  #endif  #endif
2394  #ifdef CONFIG_SAKURA  #ifdef CONFIG_SAKURA
2395          printk(KERN_INFO "SAKURA: 1.6.2-pre   2008/06/10\n");          printk(KERN_INFO "SAKURA: 1.6.2-pre   2008/06/11\n");
2396  #endif  #endif
2397  #ifdef CONFIG_TOMOYO  #ifdef CONFIG_TOMOYO
2398          printk(KERN_INFO "TOMOYO: 1.6.2-pre   2008/06/10\n");          printk(KERN_INFO "TOMOYO: 1.6.2-pre   2008/06/11\n");
2399  #endif  #endif
2400          printk(KERN_INFO "Mandatory Access Control activated.\n");          printk(KERN_INFO "Mandatory Access Control activated.\n");
2401          sbin_init_started = true;          sbin_init_started = true;
# Line 2648  static int write_answer(struct ccs_io_bu Line 2646  static int write_answer(struct ccs_io_bu
2646          struct list_head *tmp;          struct list_head *tmp;
2647          unsigned int serial;          unsigned int serial;
2648          unsigned int answer;          unsigned int answer;
         if (!ccs_check_flags(CCS_ALLOW_ENFORCE_GRACE))  
                 return -EPERM;  
2649          /***** CRITICAL SECTION START *****/          /***** CRITICAL SECTION START *****/
2650          spin_lock(&query_lock);          spin_lock(&query_lock);
2651          list_for_each(tmp, &query_list) {          list_for_each(tmp, &query_list) {

Legend:
Removed from v.1280  
changed lines
  Added in v.1283

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26