niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

perf strbuf: Match va_{add,copy} with va_end

Browse source 
Ensure that all code paths in strbuf_addv() call va_end() on the
ap_saved copy that was made.

Fixes the following coverity complaint:

  Error: VARARGS (CWE-237): [#def683]
  tools/perf/util/strbuf.c:106: missing_va_end: va_end was not called
  for "ap_saved".

Signed-off-by: Sanskriti Sharma <sansharm@redhat.com>
Reviewed-by: Jiri Olsa <jolsa@kernel.org>
Cc: Joe Lawrence <joe.lawrence@redhat.com>
Link: http://lkml.kernel.org/r/1538490554-8161-2-git-send-email-sansharm@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Sanskriti Sharma 2018-10-02 10:29:10 -04:00 • committed by Arnaldo Carvalho de Melo
parent 0e24147d69
commit ce49d8436c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/perf/util/strbuf.c
View file

@ -98,19 +98,25 @@ static int strbuf_addv(struct strbuf *sb, const char *fmt, va_list ap)
va_copy(ap_saved, ap); va_copy(ap_saved, ap);
len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap); len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
if (len < 0) if (len < 0) {
va_end(ap_saved);
return len; return len;
}
if (len > strbuf_avail(sb)) { if (len > strbuf_avail(sb)) {
ret = strbuf_grow(sb, len); ret = strbuf_grow(sb, len);
if (ret) if (ret) {
va_end(ap_saved);
return ret; return ret;
}
len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap_saved); len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap_saved);
va_end(ap_saved); va_end(ap_saved);
if (len > strbuf_avail(sb)) { if (len > strbuf_avail(sb)) {
pr_debug("this should not happen, your vsnprintf is broken"); pr_debug("this should not happen, your vsnprintf is broken");
va_end(ap_saved);
return -EINVAL; return -EINVAL;
} }
} }
va_end(ap_saved);
return strbuf_setlen(sb, sb->len + len); return strbuf_setlen(sb, sb->len + len);
} }