diff options
author | Eric Paris <eparis@redhat.com> | 2009-06-11 14:31:37 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-24 00:00:52 -0400 |
commit | 9d9609851003ebed15957f0f2ce18492739ee124 (patch) | |
tree | 2c116865d2f239b5596b22a3a79eecc82f5e1299 /kernel/auditsc.c | |
parent | 35fe4d0b1b12286a81938e9c5fdfaf639ac0ce5b (diff) |
Audit: clean up all op= output to include string quoting
A number of places in the audit system we send an op= followed by a string
that includes spaces. Somehow this works but it's just wrong. This patch
moves all of those that I could find to be quoted.
Example:
Change From: type=CONFIG_CHANGE msg=audit(1244666690.117:31): auid=0 ses=1
subj=unconfined_u:unconfined_r:auditctl_t:s0-s0:c0.c1023 op=remove rule
key="number2" list=4 res=0
Change To: type=CONFIG_CHANGE msg=audit(1244666690.117:31): auid=0 ses=1
subj=unconfined_u:unconfined_r:auditctl_t:s0-s0:c0.c1023 op="remove rule"
key="number2" list=4 res=0
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r-- | kernel/auditsc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 0b862cac6ca2..2de95d1582bc 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -1137,7 +1137,7 @@ static int audit_log_single_execve_arg(struct audit_context *context, | |||
1137 | if (has_cntl) | 1137 | if (has_cntl) |
1138 | audit_log_n_hex(*ab, buf, to_send); | 1138 | audit_log_n_hex(*ab, buf, to_send); |
1139 | else | 1139 | else |
1140 | audit_log_format(*ab, "\"%s\"", buf); | 1140 | audit_log_string(*ab, buf); |
1141 | 1141 | ||
1142 | p += to_send; | 1142 | p += to_send; |
1143 | len_left -= to_send; | 1143 | len_left -= to_send; |
@@ -1372,11 +1372,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts | |||
1372 | 1372 | ||
1373 | 1373 | ||
1374 | audit_log_task_info(ab, tsk); | 1374 | audit_log_task_info(ab, tsk); |
1375 | if (context->filterkey) { | 1375 | audit_log_key(ab, context->filterkey); |
1376 | audit_log_format(ab, " key="); | ||
1377 | audit_log_untrustedstring(ab, context->filterkey); | ||
1378 | } else | ||
1379 | audit_log_format(ab, " key=(null)"); | ||
1380 | audit_log_end(ab); | 1376 | audit_log_end(ab); |
1381 | 1377 | ||
1382 | for (aux = context->aux; aux; aux = aux->next) { | 1378 | for (aux = context->aux; aux; aux = aux->next) { |