summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-03-05 16:29:55 -0500
committerEric Paris <eparis@redhat.com>2014-03-20 10:11:58 -0400
commitf12835276c3182f2b998d93dfd60100cf4b60c05 (patch)
tree9d5c96c4038b0ac0e61bfa9c8337bf46bcb2a7ee
parentddfad8affdb73cc8df5890fef16d98d63ff3a6f0 (diff)
downloadop-kernel-dev-f12835276c3182f2b998d93dfd60100cf4b60c05.zip
op-kernel-dev-f12835276c3182f2b998d93dfd60100cf4b60c05.tar.gz
audit: remove stray newlines from audit_log_lost messages
Calling audit_log_lost with a \n in the format string leads to extra newlines in dmesg. That function will eventually call audit_panic which uses pr_err with an explicit \n included. Just make these calls match the others that lack \n. Reported-by: Jonathan Kamens <jik@kamens.brookline.ma.us> Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
-rw-r--r--kernel/audit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 72c6e1c..c0696dc 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -396,7 +396,7 @@ static void audit_printk_skb(struct sk_buff *skb)
if (printk_ratelimit())
pr_notice("type=%d %s\n", nlh->nlmsg_type, data);
else
- audit_log_lost("printk limit exceeded\n");
+ audit_log_lost("printk limit exceeded");
}
audit_hold_skb(skb);
@@ -412,7 +412,7 @@ static void kauditd_send_skb(struct sk_buff *skb)
BUG_ON(err != -ECONNREFUSED); /* Shouldn't happen */
if (audit_pid) {
pr_err("*NO* daemon at audit_pid=%d\n", audit_pid);
- audit_log_lost("auditd disappeared\n");
+ audit_log_lost("auditd disappeared");
audit_pid = 0;
audit_sock = NULL;
}
OpenPOWER on IntegriCloud