From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 8 Jan 2012 21:44:29 +0000 (+0100)
Subject: audit: always follow va_copy() with va_end()
X-Git-Tag: upstream/snapshot3+hdmi~8426
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0e86bd4252519321b0d102dc4ed90557aa7bee9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

audit: always follow va_copy() with va_end()

A call to va_copy() should always be followed by a call to va_end() in
the same function.  In kernel/autit.c::audit_log_vformat() this is not
always done.  This patch makes sure va_end() is always called.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Paris <eparis@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/audit.c b/kernel/audit.c
index 09fae26..2c1d6ab 100644
--- a/kernel/audit.c
+++ b/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;
 }