From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Fri, 13 May 2005 15:35:19 +0000 (+0100)
Subject: AUDIT: Round up audit skb expansion to AUDIT_BUFSIZ.
X-Git-Tag: v2.6.14-rc2~49^2~63
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9ea74f0655412d0fbd12bf9adb6c14c8fe707a42;p=~emulex%2Finfiniband.git

AUDIT: Round up audit skb expansion to AUDIT_BUFSIZ.

Otherwise, we will be repeatedly reallocating, even if we're only
adding a few bytes at a time. Pointed out by Steve Grubb.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/kernel/audit.c b/kernel/audit.c
index 060b554f481..187164572bd 100644
--- a/kernel/audit.c
+++ b/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);