diff options
| author | Sanskriti Sharma <sansharm@redhat.com> | 2018-10-02 10:29:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-13 11:14:53 -0800 |
| commit | 1ab8d2dbc1a07743d0e48f63ec0d0179e6b3c900 (patch) | |
| tree | 774eed73da98f3ecaaa05fa919e4f3195cebb8ce /tools/perf/util/strbuf.c | |
| parent | 2e8e70e56265496274e0c19464fffe896009bfc0 (diff) | |
| download | linux-stable-1ab8d2dbc1a07743d0e48f63ec0d0179e6b3c900.tar.gz linux-stable-1ab8d2dbc1a07743d0e48f63ec0d0179e6b3c900.tar.bz2 linux-stable-1ab8d2dbc1a07743d0e48f63ec0d0179e6b3c900.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/perf/util/strbuf.c')
| -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); } |