From: Josh Boyer Date: Wed, 5 Mar 2014 21:29:55 +0000 (-0500) Subject: audit: remove stray newlines from audit_log_lost messages X-Git-Tag: v3.15-rc1~18^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f12835276c3182f2b998d93dfd60100cf4b60c05;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Josh Boyer Signed-off-by: Richard Guy Briggs --- diff --git a/kernel/audit.c b/kernel/audit.c index 72c6e1cd6ef57..c0696dcfed119 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; }