diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-13 16:35:19 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-13 16:35:19 +0100 |
| commit | 9ea74f0655412d0fbd12bf9adb6c14c8fe707a42 (patch) | |
| tree | 8c04a9c6ed0144ff217b227fbf354f41dbceb023 | |
| parent | add671412021b68c3b4f2882b0d10a56e2dcdabe (diff) | |
| download | blackbird-op-linux-9ea74f0655412d0fbd12bf9adb6c14c8fe707a42.tar.gz blackbird-op-linux-9ea74f0655412d0fbd12bf9adb6c14c8fe707a42.zip | |
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>
| -rw-r--r-- | kernel/audit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 060b554f481e..187164572bd0 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); |
