Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 19 May 2005 10:54:00 +0000 (11:54 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 19 May 2005 10:54:00 +0000 (11:54 +0100)
1  2 
security/selinux/ss/services.c

index 07fdf6ee6148fa3edfbea42ca96ff80af60b2c47,8449d667b062f7bd81b5301846435358bcaa2788..b6149147d5cb6ef585f09846d03819f454259e45
@@@ -365,7 -365,7 +365,7 @@@ static int security_validtrans_handle_f
                goto out;
        if (context_struct_to_string(tcontext, &t, &tlen) < 0)
                goto out;
 -      audit_log(current->audit_context,
 +      audit_log(current->audit_context, AUDIT_SELINUX_ERR,
                  "security_validate_transition:  denied for"
                  " oldcontext=%s newcontext=%s taskcontext=%s tclass=%s",
                  o, n, t, policydb.p_class_val_to_name[tclass-1]);
@@@ -476,8 -476,8 +476,8 @@@ int security_compute_av(u32 ssid
        int rc = 0;
  
        if (!ss_initialized) {
-               avd->allowed = requested;
-               avd->decided = requested;
+               avd->allowed = 0xffffffff;
+               avd->decided = 0xffffffff;
                avd->auditallow = 0;
                avd->auditdeny = 0xffffffff;
                avd->seqno = latest_granting;
@@@ -742,7 -742,7 +742,7 @@@ static int compute_sid_handle_invalid_c
                goto out;
        if (context_struct_to_string(newcontext, &n, &nlen) < 0)
                goto out;
 -      audit_log(current->audit_context,
 +      audit_log(current->audit_context, AUDIT_SELINUX_ERR,
                  "security_compute_sid:  invalid context %s"
                  " for scontext=%s"
                  " tcontext=%s"
@@@ -1196,9 -1196,11 +1196,11 @@@ int security_load_policy(void *data, si
                }
                policydb_loaded_version = policydb.policyvers;
                ss_initialized = 1;
+               seqno = ++latest_granting;
                LOAD_UNLOCK;
                selinux_complete_init();
+               avc_ss_reset(seqno);
+               selnl_notify_policyload(seqno);
                return 0;
        }