From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Fri, 13 May 2005 17:50:33 +0000 (+0100)
Subject: AUDIT: fix max_t thinko.
X-Git-Tag: v2.6.14-rc2~49^2~60
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5e014b10ef8477c32a939a48fa02aedcad35a226;p=~emulex%2Finfiniband.git

AUDIT: fix max_t thinko.

Der... if you use max_t it helps if you give it a type.

Note to self: Always just apply the tested patches, don't try to port
them by hand. You're not clever enough.

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

diff --git a/kernel/audit.c b/kernel/audit.c
index 74779d3769f..a0e33b6897d 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -703,7 +703,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, max_t(AUDIT_BUFSIZ, 1+len-avail));
+		avail = audit_expand(ab, max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
 		if (!avail)
 			goto out;
 		len = vsnprintf(skb->tail, avail, fmt, args2);