Commit a0e86bd4 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds

audit: always follow va_copy() with va_end()

A call to va_copy() should always be followed by a call to va_end() in
the same function.  In kernel/autit.c::audit_log_vformat() this is not
always done.  This patch makes sure va_end() is always called.
Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Paris <eparis@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7dd72f51
...@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt, ...@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
avail = audit_expand(ab, avail = audit_expand(ab,
max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail)); max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
if (!avail) if (!avail)
goto out; goto out_va_end;
len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2); len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
} }
va_end(args2);
if (len > 0) if (len > 0)
skb_put(skb, len); skb_put(skb, len);
out_va_end:
va_end(args2);
out: out:
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment