diff options
| author | Sanskriti Sharma | 2018-10-02 16:29:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-13 20:08:22 +0100 |
| commit | ce081fc137c8e5808396a5e0ea85af9d239e42c1 (patch) | |
| tree | 4e8d92bcc797f68446461a5f32dcdc3234bf82e4 /tools | |
| parent | perf tools: Free 'printk' string in parse_ftrace_printk() (diff) | |
| download | kernel-qcow2-linux-ce081fc137c8e5808396a5e0ea85af9d239e42c1.tar.gz kernel-qcow2-linux-ce081fc137c8e5808396a5e0ea85af9d239e42c1.tar.xz kernel-qcow2-linux-ce081fc137c8e5808396a5e0ea85af9d239e42c1.zip | |
perf strbuf: Match va_{add,copy} with va_end
[ Upstream commit ce49d8436cffa9b7a6a5f110879d53e89dbc6746 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/strbuf.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/perf/util/strbuf.c b/tools/perf/util/strbuf.c index 3d1cf5bf7f18..9005fbe0780e 100644 --- a/tools/perf/util/strbuf.c +++ b/tools/perf/util/strbuf.c @@ -98,19 +98,25 @@ static int strbuf_addv(struct strbuf *sb, const char *fmt, va_list ap) va_copy(ap_saved, 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; + } if (len > strbuf_avail(sb)) { ret = strbuf_grow(sb, len); - if (ret) + if (ret) { + va_end(ap_saved); return ret; + } len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap_saved); va_end(ap_saved); if (len > strbuf_avail(sb)) { pr_debug("this should not happen, your vsnprintf is broken"); + va_end(ap_saved); return -EINVAL; } } + va_end(ap_saved); return strbuf_setlen(sb, sb->len + len); } |