[PATCH AUTOSEL 4.19 021/146] perf strbuf: Match va_{add,copy} with va_end

2018-10-31 Thread Sasha Levin 
From: Sanskriti Sharma 

[ 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 
Reviewed-by: Jiri Olsa 
Cc: Joe Lawrence 
Link: 
http://lkml.kernel.org/r/1538490554-8161-2-git-send-email-sansh...@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: Sasha Levin 
---
 tools/perf/util/strbuf.c | 10 --
 1 file 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);
 }
 
-- 
2.17.1

[PATCH AUTOSEL 4.19 021/146] perf strbuf: Match va_{add,copy} with va_end

2018-10-31 Thread Sasha Levin 
From: Sanskriti Sharma 

[ 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 
Reviewed-by: Jiri Olsa 
Cc: Joe Lawrence 
Link: 
http://lkml.kernel.org/r/1538490554-8161-2-git-send-email-sansh...@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: Sasha Levin 
---
 tools/perf/util/strbuf.c | 10 --
 1 file 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);
 }
 
-- 
2.17.1