Messages in this thread Patch in this message | | | From | Richard Guy Briggs <> | Subject | [PATCH] fixup! audit: try harder to send to auditd upon netlink failure | Date | Sat, 19 Sep 2015 17:52:50 -0400 |
| |
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 <rgb@redhat.com> --- kernel/audit.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/kernel/audit.c b/kernel/audit.c index 18cdfe2..9d32218 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]; + + snprintf(s, sizeof(s), "audit_pid=%d reset", audit_pid); + audit_log_lost(s); audit_pid = 0; audit_sock = NULL; } else { -- 1.7.1
| |