Commit ca96a895 authored by Jiri Pirko's avatar Jiri Pirko Committed by Al Viro

audit: EXECVE record - removed bogus newline

(updated)
Added hunk that changes the comment, the rest is the same.

EXECVE records contain a newline after every argument. auditd converts
"\n" to " " so you cannot see newlines even in raw logs, but they're
there nevertheless. If you're not using auditd, you need to work round
them. These '\n' chars are can be easily replaced by spaces when
creating record in kernel. Note there is no need for trailing '\n' in
an audit record.

record before this patch:
"type=EXECVE msg=audit(1231421801.566:31): argc=4 a0=\"./test\"\na1=\"a\"\na2=\"b\"\na3=\"c\"\n"

record after this patch:
"type=EXECVE msg=audit(1231421801.566:31): argc=4 a0=\"./test\" a1=\"a\" a2=\"b\" a3=\"c\""
Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Acked-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6bb59750
...@@ -1024,7 +1024,7 @@ static int audit_log_single_execve_arg(struct audit_context *context, ...@@ -1024,7 +1024,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
{ {
char arg_num_len_buf[12]; char arg_num_len_buf[12];
const char __user *tmp_p = p; const char __user *tmp_p = p;
/* how many digits are in arg_num? 3 is the length of a=\n */ /* how many digits are in arg_num? 3 is the length of " a=" */
size_t arg_num_len = snprintf(arg_num_len_buf, 12, "%d", arg_num) + 3; size_t arg_num_len = snprintf(arg_num_len_buf, 12, "%d", arg_num) + 3;
size_t len, len_left, to_send; size_t len, len_left, to_send;
size_t max_execve_audit_len = MAX_EXECVE_AUDIT_LEN; size_t max_execve_audit_len = MAX_EXECVE_AUDIT_LEN;
...@@ -1110,7 +1110,7 @@ static int audit_log_single_execve_arg(struct audit_context *context, ...@@ -1110,7 +1110,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
* so we can be sure nothing was lost. * so we can be sure nothing was lost.
*/ */
if ((i == 0) && (too_long)) if ((i == 0) && (too_long))
audit_log_format(*ab, "a%d_len=%zu ", arg_num, audit_log_format(*ab, " a%d_len=%zu", arg_num,
has_cntl ? 2*len : len); has_cntl ? 2*len : len);
/* /*
...@@ -1130,7 +1130,7 @@ static int audit_log_single_execve_arg(struct audit_context *context, ...@@ -1130,7 +1130,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
buf[to_send] = '\0'; buf[to_send] = '\0';
/* actually log it */ /* actually log it */
audit_log_format(*ab, "a%d", arg_num); audit_log_format(*ab, " a%d", arg_num);
if (too_long) if (too_long)
audit_log_format(*ab, "[%d]", i); audit_log_format(*ab, "[%d]", i);
audit_log_format(*ab, "="); audit_log_format(*ab, "=");
...@@ -1138,7 +1138,6 @@ static int audit_log_single_execve_arg(struct audit_context *context, ...@@ -1138,7 +1138,6 @@ static int audit_log_single_execve_arg(struct audit_context *context,
audit_log_n_hex(*ab, buf, to_send); audit_log_n_hex(*ab, buf, to_send);
else else
audit_log_format(*ab, "\"%s\"", buf); audit_log_format(*ab, "\"%s\"", buf);
audit_log_format(*ab, "\n");
p += to_send; p += to_send;
len_left -= to_send; len_left -= to_send;
...@@ -1166,7 +1165,7 @@ static void audit_log_execve_info(struct audit_context *context, ...@@ -1166,7 +1165,7 @@ static void audit_log_execve_info(struct audit_context *context,
p = (const char __user *)axi->mm->arg_start; p = (const char __user *)axi->mm->arg_start;
audit_log_format(*ab, "argc=%d ", axi->argc); audit_log_format(*ab, "argc=%d", axi->argc);
/* /*
* we need some kernel buffer to hold the userspace args. Just * we need some kernel buffer to hold the userspace args. Just
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment