From 0e8438edcafb0461914e0e70504ac6c691674651 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 10 Mar 2009 18:00:14 -0400 Subject: [PATCH] --- yaml --- r: 142025 b: refs/heads/master c: def57543418a5f47debae28a0a9dea2effc11692 h: refs/heads/master i: 142023: ce9c7d10ca8645904c7273af406412496f4cd7de v: v3 --- [refs] | 2 +- trunk/kernel/audit.c | 4 ++-- trunk/kernel/auditsc.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7fc43581cb5a..2051c6c9917a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 679173b724631f49e537a15fa48ea2000bdc1808 +refs/heads/master: def57543418a5f47debae28a0a9dea2effc11692 diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c index 5560390cb0f5..9442c3533ba9 100644 --- a/trunk/kernel/audit.c +++ b/trunk/kernel/audit.c @@ -1440,13 +1440,13 @@ void audit_log_d_path(struct audit_buffer *ab, const char *prefix, /* We will allow 11 spaces for ' (deleted)' to be appended */ pathname = kmalloc(PATH_MAX+11, ab->gfp_mask); if (!pathname) { - audit_log_format(ab, ""); + audit_log_string(ab, ""); return; } p = d_path(path, pathname, PATH_MAX+11); if (IS_ERR(p)) { /* Should never happen since we send PATH_MAX */ /* FIXME: can we save some information here? */ - audit_log_format(ab, ""); + audit_log_string(ab, ""); } else audit_log_untrustedstring(ab, p); kfree(pathname); diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c index aa0428e08367..7d6ac7c1f414 100644 --- a/trunk/kernel/auditsc.c +++ b/trunk/kernel/auditsc.c @@ -1478,7 +1478,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts case 0: /* name was specified as a relative path and the * directory component is the cwd */ - audit_log_d_path(ab, " name=", &context->pwd); + audit_log_d_path(ab, "name=", &context->pwd); break; default: /* log the name's directory component */