lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AUDIT: Fix abuse of va_args.

Browse Source 
We're not allowed to use args twice; we need to use va_copy.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse
2005-05-10 18:58:51 +01:00
parent e3b926b4c1
commit eecb0a7338
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/audit.c
View File

@@ -708,6 +708,7 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
{ {
int len, avail; int len, avail;
struct sk_buff *skb; struct sk_buff *skb;
va_list args2;
if (!ab) if (!ab)
return; return;
@@ -720,6 +721,7 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
if (!avail) if (!avail)
goto out; goto out;
} }
va_copy(args2, args);
len = vsnprintf(skb->tail, avail, fmt, args); len = vsnprintf(skb->tail, avail, fmt, args);
if (len >= avail) { if (len >= avail) {
/* The printk buffer is 1024 bytes long, so if we get /* The printk buffer is 1024 bytes long, so if we get
@@ -728,7 +730,7 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
avail = audit_expand(ab, 1+len-avail); avail = audit_expand(ab, 1+len-avail);
if (!avail) if (!avail)
goto out; goto out;
len = vsnprintf(skb->tail, avail, fmt, args); len = vsnprintf(skb->tail, avail, fmt, args2);
} }
skb_put(skb, (len < avail) ? len : avail); skb_put(skb, (len < avail) ? len : avail);
out: out: