Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1227633

[PATCH] fixup! audit: try harder to send to auditd upon netlink failure

Show all headers | View raw

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..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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] fixup! audit: try harder to send to auditd upon netlink failure Richard Guy Briggs <rgb@redhat.com> - 2015-09-18 10:00 +0200
  Re: [PATCH] fixup! audit: try harder to send to auditd upon netlink  failure Steve Grubb <sgrubb@redhat.com> - 2015-09-18 11:20 +0200
    Re: [PATCH] fixup! audit: try harder to send to auditd upon netlink  failure Richard Guy Briggs <rgb@redhat.com> - 2015-09-18 12:10 +0200
  Re: [PATCH] fixup! audit: try harder to send to auditd upon netlink failure Paul Moore <pmoore@redhat.com> - 2015-09-18 22:40 +0200
    Re: [PATCH] fixup! audit: try harder to send to auditd upon netlink  failure Richard Guy Briggs <rgb@redhat.com> - 2015-09-20 00:00 +0200

csiph-web