tomoyo: Swicth from cred->security to task_struct->security.

[sfrench/cifs-2.6.git] / security / tomoyo / domain.c

diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index b7469fdbff01d27f234658022ee84dfaca2394a8..39abf3ae6168e419afff9b0c44cedccdf9d1ab37 100644 (file)
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -678,7 +678,6 @@ out:
  */
 int tomoyo_find_next_domain(struct linux_binprm *bprm)
 {
-       struct tomoyo_domain_info **blob;
        struct tomoyo_domain_info *old_domain = tomoyo_domain();
        struct tomoyo_domain_info *domain = NULL;
        const char *original_name = bprm->filename;
@@ -843,9 +842,13 @@ force_jump_domain:
        if (!domain)
                domain = old_domain;
        /* Update reference count on "struct tomoyo_domain_info". */
-       atomic_inc(&domain->users);
-       blob = tomoyo_cred(bprm->cred);
-       *blob = domain;
+       {
+               struct tomoyo_task *s = tomoyo_task(current);
+
+               s->old_domain_info = s->domain_info;
+               s->domain_info = domain;
+               atomic_inc(&domain->users);
+       }
        kfree(exename.name);
        if (!retval) {
                ee->r.domain = domain;