From 6f8d78c56dd7c63a474f90cc20abdfba64f5710b Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Tue, 10 May 2005 18:58:51 +0100
Subject: [PATCH] --- yaml --- r: 2191 b: refs/heads/master c:
 eecb0a7338ef6504aa49def4dde6429853025801 h: refs/heads/master i:   2189:
 b5f2ee1b0450e736fc1b48893b7de85d94ab9439   2187:
 a16f9899d5cb85871badd2a70d9beb47ea77ace8   2183:
 66c5118e14a1f7b06a545d68c94b10ce356d1925   2175:
 f3eb7b1a69aefa0f1e2f08c0f167a40a4df5ee9f v: v3

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

diff --git a/[refs] b/[refs]
index 81c5556d13b7..cea72cf61c03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3b926b4c1499ba7b1b9513aa6113944d572aba5
+refs/heads/master: eecb0a7338ef6504aa49def4dde6429853025801
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index 1dd456c90ae5..ddb69a458203 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -708,6 +708,7 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
 {
 	int len, avail;
 	struct sk_buff *skb;
+	va_list args2;
 
 	if (!ab)
 		return;
@@ -720,6 +721,7 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
 		if (!avail)
 			goto out;
 	}
+	va_copy(args2, args);
 	len = vsnprintf(skb->tail, avail, fmt, args);
 	if (len >= avail) {
 		/* The printk buffer is 1024 bytes long, so if we get
@@ -728,7 +730,7 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
 		avail = audit_expand(ab, 1+len-avail);
 		if (!avail)
 			goto out;
-		len = vsnprintf(skb->tail, avail, fmt, args);
+		len = vsnprintf(skb->tail, avail, fmt, args2);
 	}
 	skb_put(skb, (len < avail) ? len : avail);
 out: