From bb4e2b295afbdc2312aab2080b607ca4beb36509 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 8 Jan 2012 22:44:29 +0100
Subject: [PATCH] --- yaml --- r: 280609 b: refs/heads/master c:
 a0e86bd4252519321b0d102dc4ed90557aa7bee9 h: refs/heads/master i:   280607:
 1d5f23a0a914776c1a42294cc6e82222afb9a238 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/audit.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 153beaf32765..d18e0c5d23c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dd72f5189b257f927cc3b35d98643a5c392f5c3
+refs/heads/master: a0e86bd4252519321b0d102dc4ed90557aa7bee9
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index 09fae2677a45..2c1d6ab7106e 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
 		avail = audit_expand(ab,
 			max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
 		if (!avail)
-			goto out;
+			goto out_va_end;
 		len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
 	}
-	va_end(args2);
 	if (len > 0)
 		skb_put(skb, len);
+out_va_end:
+	va_end(args2);
 out:
 	return;
 }