From db69d4caa5e337db58a7f062ba1623d9a82902ae Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Fri, 13 May 2005 16:35:19 +0100
Subject: [PATCH] --- yaml --- r: 2197 b: refs/heads/master c:
 9ea74f0655412d0fbd12bf9adb6c14c8fe707a42 h: refs/heads/master i:   2195:
 6cc35002078d0585d349a7ca34c9b75b56bea64e v: v3

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

diff --git a/[refs] b/[refs]
index cab5a6b33e9f..c23000be5a48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: add671412021b68c3b4f2882b0d10a56e2dcdabe
+refs/heads/master: 9ea74f0655412d0fbd12bf9adb6c14c8fe707a42
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index 060b554f481e..187164572bd0 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -670,7 +670,7 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
 		/* The printk buffer is 1024 bytes long, so if we get
 		 * here and AUDIT_BUFSIZ is at least 1024, then we can
 		 * log everything that printk could have logged. */
-		avail = audit_expand(ab, 1+len-avail);
+		avail = audit_expand(ab, max_t(AUDIT_BUFSIZ, 1+len-avail));
 		if (!avail)
 			goto out;
 		len = vsnprintf(skb->tail, avail, fmt, args2);