Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-3.10.git] / security / selinux / ss / services.c

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 8449d667b062f7bd81b5301846435358bcaa2788..b6149147d5cb6ef585f09846d03819f454259e45 100644 (file)
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -365,7 +365,7 @@ static int security_validtrans_handle_fail(struct context *ocontext,
                goto out;
        if (context_struct_to_string(tcontext, &t, &tlen) < 0)
                goto out;
                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]);
                  "security_validate_transition:  denied for"
                  " oldcontext=%s newcontext=%s taskcontext=%s tclass=%s",
                  o, n, t, policydb.p_class_val_to_name[tclass-1]);


@@ -742,7 +742,7 @@ static int compute_sid_handle_invalid_context(
                goto out;
        if (context_struct_to_string(newcontext, &n, &nlen) < 0)
                goto out;
                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"
                  "security_compute_sid:  invalid context %s"
                  " for scontext=%s"
                  " tcontext=%s"