From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Guy Briggs Subject: [PATCH] fixup! audit: try harder to send to auditd upon netlink failure Date: Fri, 18 Sep 2015 03:52:43 -0400 Message-ID: <89a693758cd8f511892fe54c2e4aaf2cfca89e89.1442562580.git.rgb@redhat.com> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: linux-audit@redhat.com, linux-kernel@vger.kernel.org Cc: Richard Guy Briggs , sgrubb@redhat.com, pmoore@redhat.com, eparis@redhat.com, v.rathor@gmail.com, ctcard@hotmail.com List-Id: linux-audit@redhat.com A bug was introduced by "audit: try harder to send to auditd upon netlink failure", caused by incomplete code and a function that expects a string and does not accept a format plus arguments. Create a temporary string variable to assemble the output text. It could be merged as a fixup if it is not yet upstream. Signed-off-by: Richard Guy Briggs --- kernel/audit.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 18cdfe2..60913e6 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -420,7 +420,10 @@ restart: if (audit_pid) { if (err == -ECONNREFUSED || err == -EPERM || ++attempts >= AUDITD_RETRIES) { - audit_log_lost("audit_pid=%d reset"); + char s[32]; + + sprintf(s, "audit_pid=%d reset", audit_pid); + audit_log_lost(s); audit_pid = 0; audit_sock = NULL; } else { -- 1.7.1