From: Andi Kleen <andi@firstfloor.org>
To: jolsa@redhat.com
Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org,
acme@infradead.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 9/9] tools, perf: Add asprintf replacement
Date: Fri, 20 Jun 2014 16:41:31 -0700 [thread overview]
Message-ID: <1403307691-30776-10-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1403307691-30776-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
asprintf corrupts memory on some older glibc versions.
Provide a replacement. This fixes various segfaults
with --branch-history on older Fedoras.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/Makefile.perf | 1 +
tools/perf/util/asprintf.c | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
create mode 100644 tools/perf/util/asprintf.c
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index ae20edf..57be4b7 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -372,6 +372,7 @@ LIB_OBJS += $(OUTPUT)util/vdso.o
LIB_OBJS += $(OUTPUT)util/stat.o
LIB_OBJS += $(OUTPUT)util/record.o
LIB_OBJS += $(OUTPUT)util/srcline.o
+LIB_OBJS += $(OUTPUT)util/asprintf.o
LIB_OBJS += $(OUTPUT)util/data.o
LIB_OBJS += $(OUTPUT)ui/setup.o
diff --git a/tools/perf/util/asprintf.c b/tools/perf/util/asprintf.c
new file mode 100644
index 0000000..9aafaca
--- /dev/null
+++ b/tools/perf/util/asprintf.c
@@ -0,0 +1,28 @@
+/* Replacement for asprintf as it's buggy in older glibc versions */
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+int vasprintf(char **str, const char *fmt, va_list ap)
+{
+ char buf[1024];
+ int len = vsnprintf(buf, sizeof buf, fmt, ap);
+
+ *str = malloc(len + 1);
+ if (!*str)
+ return -1;
+ strcpy(*str, buf);
+ return len;
+}
+
+int asprintf(char **str, const char *fmt, ...)
+{
+ va_list ap;
+ int ret;
+
+ va_start(ap, fmt);
+ ret = vasprintf(str, fmt, ap);
+ va_end(ap);
+ return ret;
+}
--
1.9.3
next prev parent reply other threads:[~2014-06-20 23:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 23:41 perf: Implement lbr-as-callgraph v8 Andi Kleen
2014-06-20 23:41 ` [PATCH 1/9] perf, tools: Support handling complete branch stacks as histograms v7 Andi Kleen
2014-06-20 23:41 ` [PATCH 2/9] perf, tools: Add --branch-history option to report v3 Andi Kleen
2014-06-20 23:41 ` [PATCH 3/9] perf, tools: Enable printing the srcline in the history v4 Andi Kleen
2014-06-20 23:41 ` [PATCH 4/9] perf, tools: Only print base source file for srcline Andi Kleen
2014-06-20 23:41 ` [PATCH 5/9] perf, tools: Support source line numbers in annotate Andi Kleen
2014-06-20 23:41 ` [PATCH 6/9] perf, tools: Fix srcline sort key output to use width Andi Kleen
2014-06-20 23:41 ` [PATCH 7/9] tools, perf: Make get_srcline fall back to sym+offset Andi Kleen
2014-06-20 23:41 ` [PATCH 8/9] tools, perf: Make srcline output address with -v Andi Kleen
2014-06-20 23:41 ` Andi Kleen [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-31 17:17 Implement lbr-as-callgraph v9 Andi Kleen
2014-07-31 17:17 ` [PATCH 9/9] tools, perf: Add asprintf replacement Andi Kleen
2014-05-16 17:05 Implement lbr-as-callgraph v7 Andi Kleen
2014-05-16 17:05 ` [PATCH 9/9] tools, perf: Add asprintf replacement Andi Kleen
2014-05-12 23:20 mplement lbr-as-callgraph v6 Andi Kleen
2014-05-12 23:20 ` [PATCH 9/9] tools, perf: Add asprintf replacement Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403307691-30776-10-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@infradead.org \
--cc=ak@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome