audit: remove stray newlines from audit_log_lost messages (f1283527) · Commits · 戴 / test

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>

kernel/audit.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message