aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/selinux/avc.c4
-rw-r--r--security/selinux/hooks.c2
-rw-r--r--security/selinux/ss/services.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 451502467a9b..2d088bb65ee8 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -242,7 +242,7 @@ void __init avc_init(void)
242 avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node), 242 avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
243 0, SLAB_PANIC, NULL, NULL); 243 0, SLAB_PANIC, NULL, NULL);
244 244
245 audit_log(current->audit_context, AUDIT_KERNEL, "AVC INITIALIZED\n"); 245 audit_log(current->audit_context, GFP_KERNEL, AUDIT_KERNEL, "AVC INITIALIZED\n");
246} 246}
247 247
248int avc_get_hash_stats(char *page) 248int avc_get_hash_stats(char *page)
@@ -550,7 +550,7 @@ void avc_audit(u32 ssid, u32 tsid,
550 return; 550 return;
551 } 551 }
552 552
553 ab = audit_log_start(current->audit_context, AUDIT_AVC); 553 ab = audit_log_start(current->audit_context, GFP_ATOMIC, AUDIT_AVC);
554 if (!ab) 554 if (!ab)
555 return; /* audit_panic has been called */ 555 return; /* audit_panic has been called */
556 audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); 556 audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted");
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 2253f388234f..9f9463000683 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3442,7 +3442,7 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb)
3442 err = selinux_nlmsg_lookup(isec->sclass, nlh->nlmsg_type, &perm); 3442 err = selinux_nlmsg_lookup(isec->sclass, nlh->nlmsg_type, &perm);
3443 if (err) { 3443 if (err) {
3444 if (err == -EINVAL) { 3444 if (err == -EINVAL) {
3445 audit_log(current->audit_context, AUDIT_SELINUX_ERR, 3445 audit_log(current->audit_context, GFP_KERNEL, AUDIT_SELINUX_ERR,
3446 "SELinux: unrecognized netlink message" 3446 "SELinux: unrecognized netlink message"
3447 " type=%hu for sclass=%hu\n", 3447 " type=%hu for sclass=%hu\n",
3448 nlh->nlmsg_type, isec->sclass); 3448 nlh->nlmsg_type, isec->sclass);
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 014120474e69..45d317044cb2 100644
--- 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,
365 goto out; 365 goto out;
366 if (context_struct_to_string(tcontext, &t, &tlen) < 0) 366 if (context_struct_to_string(tcontext, &t, &tlen) < 0)
367 goto out; 367 goto out;
368 audit_log(current->audit_context, AUDIT_SELINUX_ERR, 368 audit_log(current->audit_context, GFP_ATOMIC, AUDIT_SELINUX_ERR,
369 "security_validate_transition: denied for" 369 "security_validate_transition: denied for"
370 " oldcontext=%s newcontext=%s taskcontext=%s tclass=%s", 370 " oldcontext=%s newcontext=%s taskcontext=%s tclass=%s",
371 o, n, t, policydb.p_class_val_to_name[tclass-1]); 371 o, n, t, policydb.p_class_val_to_name[tclass-1]);
@@ -771,7 +771,7 @@ static int compute_sid_handle_invalid_context(
771 goto out; 771 goto out;
772 if (context_struct_to_string(newcontext, &n, &nlen) < 0) 772 if (context_struct_to_string(newcontext, &n, &nlen) < 0)
773 goto out; 773 goto out;
774 audit_log(current->audit_context, AUDIT_SELINUX_ERR, 774 audit_log(current->audit_context, GFP_ATOMIC, AUDIT_SELINUX_ERR,
775 "security_compute_sid: invalid context %s" 775 "security_compute_sid: invalid context %s"
776 " for scontext=%s" 776 " for scontext=%s"
777 " tcontext=%s" 777 " tcontext=%s"