|
@@ -1024,7 +1024,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
|
|
|
{
|
|
|
char arg_num_len_buf[12];
|
|
|
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 len, len_left, to_send;
|
|
|
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,
|
|
|
* so we can be sure nothing was lost.
|
|
|
*/
|
|
|
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);
|
|
|
|
|
|
/*
|
|
@@ -1130,7 +1130,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
|
|
|
buf[to_send] = '\0';
|
|
|
|
|
|
/* actually log it */
|
|
|
- audit_log_format(*ab, "a%d", arg_num);
|
|
|
+ audit_log_format(*ab, " a%d", arg_num);
|
|
|
if (too_long)
|
|
|
audit_log_format(*ab, "[%d]", i);
|
|
|
audit_log_format(*ab, "=");
|
|
@@ -1138,7 +1138,6 @@ static int audit_log_single_execve_arg(struct audit_context *context,
|
|
|
audit_log_n_hex(*ab, buf, to_send);
|
|
|
else
|
|
|
audit_log_format(*ab, "\"%s\"", buf);
|
|
|
- audit_log_format(*ab, "\n");
|
|
|
|
|
|
p += to_send;
|
|
|
len_left -= to_send;
|
|
@@ -1166,7 +1165,7 @@ static void audit_log_execve_info(struct audit_context *context,
|
|
|
|
|
|
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
|