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

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.7.x/ccs-patch/security/ccsecurity/util.c




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



 Parent Directory

|  Revision Log



|  Patch














revision 1609 by kumaneko,
Fri Sep 19 09:15:43 2008 UTC




revision 1644 by kumaneko,
Wed Oct  1 07:12:42 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.5-pre   2008/09/19


  * Version: 1.6.5-pre   2008/10/01















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 2473 
 void ccs_load_policy(const char *filenam


Line 2473 
 void ccs_load_policy(const char *filenam












2473
         }
         }

















2474
 #endif
 #endif

















2475
 #ifdef CONFIG_SAKURA
 #ifdef CONFIG_SAKURA















2476


         printk(KERN_INFO "SAKURA: 1.6.5-pre   2008/09/09\n");


         printk(KERN_INFO "SAKURA: 1.6.5-pre   2008/10/01\n");















2477
 #endif
 #endif

















2478
 #ifdef CONFIG_TOMOYO
 #ifdef CONFIG_TOMOYO















2479


         printk(KERN_INFO "TOMOYO: 1.6.5-pre   2008/09/19\n");


         printk(KERN_INFO "TOMOYO: 1.6.5-pre   2008/10/01\n");















2480
 #endif
 #endif

















2481
         printk(KERN_INFO "Mandatory Access Control activated.\n");
         printk(KERN_INFO "Mandatory Access Control activated.\n");

















2482
         sbin_init_started = true;
         sbin_init_started = true;











#

Line 2518 
 static atomic_t queryd_watcher = ATOMIC_


Line 2518 
 static atomic_t queryd_watcher = ATOMIC_












2518
 /**
 /**

















2519
  * ccs_check_supervisor - Ask for the supervisor's decision.
  * ccs_check_supervisor - Ask for the supervisor's decision.

















2520
  *
  *















2521


  * @bprm: Pointer to "struct linux_binprm". May be NULL.


  * @retries: How many retries are made for this request.













2522


  * @fmt:  The printf()'s format string, followed by parameters.


  * @bprm:    Pointer to "struct linux_binprm". May be NULL.













2523


 


  * @fmt:     The printf()'s format string, followed by parameters.















2524
  *
  *

















2525
  * Returns 0 if the supervisor decided to permit the access request which
  * Returns 0 if the supervisor decided to permit the access request which

















2526
  * violated the policy in enforcing mode, 1 if the supervisor decided to
  * violated the policy in enforcing mode, 1 if the supervisor decided to

















2527
  * retry the access request which violated the policy in enforcing mode,
  * retry the access request which violated the policy in enforcing mode,

















2528
  * -EPERM otherwise.
  * -EPERM otherwise.

















2529
  */
  */















2530


 int ccs_check_supervisor(struct linux_binprm *bprm, const char *fmt, ...)


 int ccs_check_supervisor(const unsigned short int retries,













2531


 


                          struct linux_binprm *bprm, const char *fmt, ...)















2532
 {
 {

















2533
         va_list args;
         va_list args;

















2534
         int error = -EPERM;
         int error = -EPERM;











#

Line 2568 
 int ccs_check_supervisor(struct linux_bi


Line 2570 
 int ccs_check_supervisor(struct linux_bi












2570
         query_entry->serial = serial++;
         query_entry->serial = serial++;

















2571
         spin_unlock(&query_lock);
         spin_unlock(&query_lock);

















2572
         /***** CRITICAL SECTION END *****/
         /***** CRITICAL SECTION END *****/















2573


         pos = snprintf(query_entry->query, len - 1, "Q%u\n%s",


         pos = snprintf(query_entry->query, len - 1, "Q%u-%hu\n%s",













2574


                        query_entry->serial, header);


                        query_entry->serial, retries, header);















2575
         ccs_free(header);
         ccs_free(header);

















2576
         header = NULL;
         header = NULL;

















2577
         va_start(args, fmt);
         va_start(args, fmt);











#

Line 3073 
 int ccs_write_control(struct file *file,


Line 3075 
 int ccs_write_control(struct file *file,












3075
         if (!access_ok(VERIFY_READ, buffer, buffer_len))
         if (!access_ok(VERIFY_READ, buffer, buffer_len))

















3076
                 return -EFAULT;
                 return -EFAULT;

















3077
         /* Don't allow updating policies by non manager programs. */
         /* Don't allow updating policies by non manager programs. */















3078


         if (head->write != write_pid && head->write != write_domain_policy &&


         if (head->write != write_pid &&













3079


 


 #ifdef CONFIG_TOMOYO













3080


 


             head->write != write_domain_policy &&













3081


 


 #endif















3082
             !is_policy_manager())
             !is_policy_manager())

















3083
                 return -EPERM;
                 return -EPERM;

















3084
         if (mutex_lock_interruptible(&head->io_sem))
         if (mutex_lock_interruptible(&head->io_sem))





























Legend:



Removed from v.1609
 


changed lines


 
Added in v.1644













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/trunk/1.7.x/ccs-patch/security/ccsecurity/util.c
-revision 1609 by kumaneko,
Fri Sep 19 09:15:43 2008 UTC
+revision 1644 by kumaneko,
Wed Oct  1 07:12:42 2008 UTC
 Line 5
   *
   * Copyright (C) 2005-2008  NTT DATA CORPORATION
   *
-  * Version: 1.6.5-pre   2008/09/19
+  * Version: 1.6.5-pre   2008/10/01
   *
   * This file is applicable to both 2.4.30 and 2.6.11 and later.
   * See README.ccs for ChangeLog.
 Line 2473 
 void ccs_load_policy(const char *filenam
          }
  #endif
  #ifdef CONFIG_SAKURA
-         printk(KERN_INFO "SAKURA: 1.6.5-pre   2008/09/09\n");
+         printk(KERN_INFO "SAKURA: 1.6.5-pre   2008/10/01\n");
  #endif
  #ifdef CONFIG_TOMOYO
-         printk(KERN_INFO "TOMOYO: 1.6.5-pre   2008/09/19\n");
+         printk(KERN_INFO "TOMOYO: 1.6.5-pre   2008/10/01\n");
  #endif
          printk(KERN_INFO "Mandatory Access Control activated.\n");
          sbin_init_started = true;
 Line 2518 
 static atomic_t queryd_watcher = ATOMIC_
  /**
   * ccs_check_supervisor - Ask for the supervisor's decision.
   *
-  * @bprm: Pointer to "struct linux_binprm". May be NULL.
+  * @retries: How many retries are made for this request.
-  * @fmt:  The printf()'s format string, followed by parameters.
+  * @bprm:    Pointer to "struct linux_binprm". May be NULL.
+  * @fmt:     The printf()'s format string, followed by parameters.
   *
   * Returns 0 if the supervisor decided to permit the access request which
   * violated the policy in enforcing mode, 1 if the supervisor decided to
   * retry the access request which violated the policy in enforcing mode,
   * -EPERM otherwise.
   */
- int ccs_check_supervisor(struct linux_binprm *bprm, const char *fmt, ...)
+ int ccs_check_supervisor(const unsigned short int retries,
+                          struct linux_binprm *bprm, const char *fmt, ...)
  {
          va_list args;
          int error = -EPERM;
-Line 2568 
 int ccs_check_supervisor(struct linux_bi
+Line 2570 
 int ccs_check_supervisor(struct linux_bi
          query_entry->serial = serial++;
          spin_unlock(&query_lock);
          /***** CRITICAL SECTION END *****/
-         pos = snprintf(query_entry->query, len - 1, "Q%u\n%s",
+         pos = snprintf(query_entry->query, len - 1, "Q%u-%hu\n%s",
-                        query_entry->serial, header);
+                        query_entry->serial, retries, header);
          ccs_free(header);
          header = NULL;
          va_start(args, fmt);
-Line 3073 
 int ccs_write_control(struct file *file,
+Line 3075 
 int ccs_write_control(struct file *file,
          if (!access_ok(VERIFY_READ, buffer, buffer_len))
                  return -EFAULT;
          /* Don't allow updating policies by non manager programs. */
-         if (head->write != write_pid && head->write != write_domain_policy &&
+         if (head->write != write_pid &&
+ #ifdef CONFIG_TOMOYO
+             head->write != write_domain_policy &&
+ #endif
              !is_policy_manager())
                  return -EPERM;
          if (mutex_lock_interruptible(&head->io_sem))
 Legend:



Removed from v.1609
 


changed lines


 
Added in v.1644
 Legend:



Removed from v.1609
 


changed lines


 
Added in v.1644
-Removed from v.1609
+Added in v.1644
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

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

TOMOYO

Subversion リポジトリの参照