Diff of /branches/ccs-patch/fs/tomoyo_domain.c

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/branches/ccs-patch/fs/tomoyo_domain.c




Diff of /branches/ccs-patch/fs/tomoyo_domain.c



 Parent Directory

|  Revision Log



|  Patch














revision 2540 by kumaneko,
Thu May 14 00:08:32 2009 UTC




revision 2544 by kumaneko,
Thu May 14 06:55:46 2009 UTC






#

Line 117 
 static int ccs_audit_execute_handler_log


Line 117 
 static int ccs_audit_execute_handler_log












117
  */
  */

















118
 static int ccs_audit_domain_creation_log(struct ccs_domain_info *domain)
 static int ccs_audit_domain_creation_log(struct ccs_domain_info *domain)

















119
 {
 {












120
 
         int error;












121
         struct ccs_request_info r;
         struct ccs_request_info r;

















122
         ccs_init_request_info(&r, domain, CCS_MAC_FOR_FILE);
         ccs_init_request_info(&r, domain, CCS_MAC_FOR_FILE);















123


         return ccs_write_audit_log(false, &r, "use_profile %u\n", r.profile);


         error = ccs_write_audit_log(false, &r, "use_profile %u\n", r.profile);













124


 


         ccs_exit_request_info(&r);













125


 


         return error;















126
 }
 }

















127
 
 

















128
 /* The list for "struct ccs_domain_initializer_entry". */
 /* The list for "struct ccs_domain_initializer_entry". */











#

Line 733 
 int ccs_delete_domain(char *domainname)


Line 736 
 int ccs_delete_domain(char *domainname)












736
 bool ccs_find_or_assign_new_domain(const char *domainname, const u8 profile,
 bool ccs_find_or_assign_new_domain(const char *domainname, const u8 profile,

















737
                                    struct ccs_cookie *cookie)
                                    struct ccs_cookie *cookie)

















738
 {
 {















739


         struct ccs_domain_info *domain = kzalloc(sizeof(*domain), GFP_KERNEL);


         struct ccs_domain_info *entry;













740


         const struct ccs_path_info *saved_domainname = ccs_get_name(domainname);


         struct ccs_domain_info *domain;













741


         if (!domain || !saved_domainname)


         const struct ccs_path_info *saved_domainname;













742


                 goto out;


         cookie->u.domain = NULL;













743


 


         if (!ccs_is_correct_domain(domainname, __func__))













744


 


                 return false;













745


 


         saved_domainname = ccs_get_name(domainname);













746


 


         if (!saved_domainname)













747


 


                 return false;













748


 


         entry = kzalloc(sizeof(*domain), GFP_KERNEL);















749
         /***** WRITER SECTION START *****/
         /***** WRITER SECTION START *****/

















750
         down_write(&ccs_policy_lock);
         down_write(&ccs_policy_lock);















751


         if (!ccs_find_domain(domainname, cookie) &&


         list_for_each_entry(domain, &ccs_domain_list, list) {













752


             ccs_is_correct_domain(domainname, __func__) &&


                 if (domain->is_deleted ||













753


             ccs_memory_ok(domain)) {


                     ccs_pathcmp(saved_domainname, domain->domainname))













754


                 INIT_LIST_HEAD(&domain->acl_info_list);


                         continue;
















                 domain->domainname = saved_domainname;


 
















                 saved_domainname = NULL;


 
















                 domain->profile = profile;


 
















                 list_add_tail(&domain->list, &ccs_domain_list);


 















755
                 cookie->u.domain = domain;
                 cookie->u.domain = domain;















756


                 domain = NULL;


                 break;













757


 


         }













758


 


         if (!cookie->u.domain && ccs_memory_ok(entry)) {













759


 


                 INIT_LIST_HEAD(&entry->acl_info_list);













760


 


                 entry->domainname = saved_domainname;













761


 


                 saved_domainname = NULL;













762


 


                 entry->profile = profile;













763


 


                 list_add_tail(&entry->list, &ccs_domain_list);













764


 


                 cookie->u.domain = entry;













765


 


                 entry = NULL;















766
         }
         }














  out:
 













767
         up_write(&ccs_policy_lock);
         up_write(&ccs_policy_lock);

















768
         /***** WRITER SECTION END *****/
         /***** WRITER SECTION END *****/

















769
         ccs_put_name(saved_domainname);
         ccs_put_name(saved_domainname);











#

Line 838 
 static int ccs_find_next_domain(struct c


Line 851 
 static int ccs_find_next_domain(struct c












851
         bool found = false;
         bool found = false;

















852
  retry:
  retry:

















853
         current->ccs_flags = ccs_flags;
         current->ccs_flags = ccs_flags;















854


         r->cond = NULL;


         r->condition_cookie.u.cond = NULL;















855
         /* Get realpath of program and symbolic link. */
         /* Get realpath of program and symbolic link. */

















856
         retval = ccs_realpath_both(bprm->filename, ee);
         retval = ccs_realpath_both(bprm->filename, ee);

















857
         if (retval < 0)
         if (retval < 0)











#

Line 960 
 static int ccs_find_next_domain(struct c


Line 973 
 static int ccs_find_next_domain(struct c












973
         }
         }

















974
         if (found || strlen(new_domain_name) >= CCS_MAX_PATHNAME_LEN)
         if (found || strlen(new_domain_name) >= CCS_MAX_PATHNAME_LEN)

















975
                 goto done;
                 goto done;














         /***** READER SECTION START *****/
 










         down_read(&ccs_policy_lock);
 













976
         found = ccs_find_domain(new_domain_name, &r->cookie);
         found = ccs_find_domain(new_domain_name, &r->cookie);














         up_read(&ccs_policy_lock);
 










         /***** READER SECTION END *****/
 













977
         if (found)
         if (found)

















978
                 goto done;
                 goto done;

















979
         if (is_enforce) {
         if (is_enforce) {











#

Line 1652 
 void ccs_finish_execve(int retval)


Line 1661 
 void ccs_finish_execve(int retval)












1661
         else
         else

















1662
                 task->ccs_flags &= ~CCS_TASK_IS_EXECUTE_HANDLER;
                 task->ccs_flags &= ~CCS_TASK_IS_EXECUTE_HANDLER;

















1663
  out:
  out:












1664
 
         ccs_exit_request_info(&ee->r);












1665
         ccs_free_execve_entry(ee);
         ccs_free_execve_entry(ee);

















1666
 }
 }

















1667
 
 





























Legend:



Removed from v.2540
 


changed lines


 
Added in v.2544













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/branches/ccs-patch/fs/tomoyo_domain.c
-revision 2540 by kumaneko,
Thu May 14 00:08:32 2009 UTC
+revision 2544 by kumaneko,
Thu May 14 06:55:46 2009 UTC
 Line 117 
 static int ccs_audit_execute_handler_log
   */
  static int ccs_audit_domain_creation_log(struct ccs_domain_info *domain)
  {
+         int error;
          struct ccs_request_info r;
          ccs_init_request_info(&r, domain, CCS_MAC_FOR_FILE);
-         return ccs_write_audit_log(false, &r, "use_profile %u\n", r.profile);
+         error = ccs_write_audit_log(false, &r, "use_profile %u\n", r.profile);
+         ccs_exit_request_info(&r);
+         return error;
  }
  /* The list for "struct ccs_domain_initializer_entry". */
-Line 733 
 int ccs_delete_domain(char *domainname)
+Line 736 
 int ccs_delete_domain(char *domainname)
  bool ccs_find_or_assign_new_domain(const char *domainname, const u8 profile,
                                     struct ccs_cookie *cookie)
  {
-         struct ccs_domain_info *domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+         struct ccs_domain_info *entry;
-         const struct ccs_path_info *saved_domainname = ccs_get_name(domainname);
+         struct ccs_domain_info *domain;
-         if (!domain || !saved_domainname)
+         const struct ccs_path_info *saved_domainname;
-                 goto out;
+         cookie->u.domain = NULL;
+         if (!ccs_is_correct_domain(domainname, __func__))
+                 return false;
+         saved_domainname = ccs_get_name(domainname);
+         if (!saved_domainname)
+                 return false;
+         entry = kzalloc(sizeof(*domain), GFP_KERNEL);
          /***** WRITER SECTION START *****/
          down_write(&ccs_policy_lock);
-         if (!ccs_find_domain(domainname, cookie) &&
+         list_for_each_entry(domain, &ccs_domain_list, list) {
-             ccs_is_correct_domain(domainname, __func__) &&
+                 if (domain->is_deleted ||
-             ccs_memory_ok(domain)) {
+                     ccs_pathcmp(saved_domainname, domain->domainname))
-                 INIT_LIST_HEAD(&domain->acl_info_list);
+                         continue;
-                 domain->domainname = saved_domainname;
-                 saved_domainname = NULL;
-                 domain->profile = profile;
-                 list_add_tail(&domain->list, &ccs_domain_list);
                  cookie->u.domain = domain;
-                 domain = NULL;
+                 break;
+         }
+         if (!cookie->u.domain && ccs_memory_ok(entry)) {
+                 INIT_LIST_HEAD(&entry->acl_info_list);
+                 entry->domainname = saved_domainname;
+                 saved_domainname = NULL;
+                 entry->profile = profile;
+                 list_add_tail(&entry->list, &ccs_domain_list);
+                 cookie->u.domain = entry;
+                 entry = NULL;
          }
-  out:
          up_write(&ccs_policy_lock);
          /***** WRITER SECTION END *****/
          ccs_put_name(saved_domainname);
-Line 838 
 static int ccs_find_next_domain(struct c
+Line 851 
 static int ccs_find_next_domain(struct c
          bool found = false;
   retry:
          current->ccs_flags = ccs_flags;
-         r->cond = NULL;
+         r->condition_cookie.u.cond = NULL;
          /* Get realpath of program and symbolic link. */
          retval = ccs_realpath_both(bprm->filename, ee);
          if (retval < 0)
-Line 960 
 static int ccs_find_next_domain(struct c
+Line 973 
 static int ccs_find_next_domain(struct c
          }
          if (found || strlen(new_domain_name) >= CCS_MAX_PATHNAME_LEN)
                  goto done;
-         /***** READER SECTION START *****/
-         down_read(&ccs_policy_lock);
          found = ccs_find_domain(new_domain_name, &r->cookie);
-         up_read(&ccs_policy_lock);
-         /***** READER SECTION END *****/
          if (found)
                  goto done;
          if (is_enforce) {
-Line 1652 
 void ccs_finish_execve(int retval)
+Line 1661 
 void ccs_finish_execve(int retval)
          else
                  task->ccs_flags &= ~CCS_TASK_IS_EXECUTE_HANDLER;
   out:
+         ccs_exit_request_info(&ee->r);
          ccs_free_execve_entry(ee);
  }
 Legend:



Removed from v.2540
 


changed lines


 
Added in v.2544
 Legend:



Removed from v.2540
 


changed lines


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

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

TOMOYO

Subversion リポジトリの参照