On 14/03/05, Josh Boyer wrote:
> 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 <[email protected]>
> Signed-off-by: Josh Boyer <[email protected]>
Ack. queued.
> ---
> kernel/audit.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/audit.c b/kernel/audit.c
> index 34c5a23..f6bce4d 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;
> }
> --
> 1.8.5.3
- RGB
--
Richard Guy Briggs <[email protected]>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red
Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
