From: Jiri Olsa <jolsa@redhat.com>
To: Andi Kleen <andi@firstfloor.org>
Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org,
acme@kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: Re: [PATCH 8/8] tools, perf: Add asprintf replacement
Date: Mon, 20 Oct 2014 20:28:18 +0200 [thread overview]
Message-ID: <20141020182818.GE9913@krava.brq.redhat.com> (raw)
In-Reply-To: <1411774636-6870-9-git-send-email-andi@firstfloor.org>
On Fri, Sep 26, 2014 at 04:37:16PM -0700, Andi Kleen wrote:
> 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/builtin-report.c | 3 ++-
> tools/perf/util/asprintf.c | 28 ++++++++++++++++++++++++++++
> 3 files changed, 31 insertions(+), 1 deletion(-)
> create mode 100644 tools/perf/util/asprintf.c
>
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 171f4e6..5bdb960 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -377,6 +377,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)util/tsc.o
> LIB_OBJS += $(OUTPUT)util/cloexec.o
> diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
> index cd87a40..96bc166 100644
> --- a/tools/perf/builtin-report.c
> +++ b/tools/perf/builtin-report.c
> @@ -756,7 +756,8 @@ repeat:
> callchain_param.branch_callstack = 1;
> callchain_param.key = CCKEY_ADDRESS;
> symbol_conf.use_callchain = true;
> - callchain_register_param(&callchain_param);
> + if (callchain_register_param(&callchain_param) < 0)
> + pr_err("Cannot register callchain parameters");
how is this hunk related to the patchset?
> if (sort_order == default_sort_order)
> sort_order = "srcline,symbol,dso";
> branch_mode = 0;
> 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];
could you please make it work for generic buf len?
> + int len = vsnprintf(buf, sizeof buf, fmt, ap);
WARNING: sizeof buf should be sizeof(buf)
> +
> + *str = malloc(len + 1);
> + if (!*str)
> + return -1;
> + strcpy(*str, buf);
> + return len;
> +}
thanks,
jirka
next prev parent reply other threads:[~2014-10-20 18:28 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-26 23:37 Implement lbr-as-callgraph v10 Andi Kleen
2014-09-26 23:37 ` [PATCH 1/8] perf, tools: Support handling complete branch stacks as histograms Andi Kleen
2014-10-20 7:54 ` Jiri Olsa
2014-10-20 10:10 ` Jiri Olsa
2014-10-22 1:03 ` Namhyung Kim
2014-11-11 23:31 ` Andi Kleen
2014-11-17 6:23 ` Namhyung Kim
2014-11-18 2:08 ` Andi Kleen
2014-09-26 23:37 ` [PATCH 2/8] perf, tools: Add --branch-history option to report Andi Kleen
2014-10-20 7:54 ` Jiri Olsa
2014-10-20 17:51 ` Jiri Olsa
2014-10-22 1:26 ` Namhyung Kim
2014-11-12 0:05 ` Andi Kleen
2014-11-17 6:31 ` Namhyung Kim
2014-11-18 2:01 ` Andi Kleen
2014-09-26 23:37 ` [PATCH 3/8] perf, tools: Enable printing the srcline in the history Andi Kleen
2014-10-20 17:57 ` Jiri Olsa
2014-09-26 23:37 ` [PATCH 4/8] perf, tools: Only print base source file for srcline Andi Kleen
2014-09-26 23:37 ` [PATCH 5/8] perf, tools: Support source line numbers in annotate Andi Kleen
2014-10-20 18:06 ` Jiri Olsa
2014-10-20 18:17 ` Jiri Olsa
2014-11-12 0:36 ` Andi Kleen
2014-09-26 23:37 ` [PATCH 6/8] tools, perf: Make get_srcline fall back to sym+offset Andi Kleen
2014-09-26 23:37 ` [PATCH 7/8] tools, perf: Make srcline output address with -v Andi Kleen
2014-10-20 18:20 ` Jiri Olsa
2014-09-26 23:37 ` [PATCH 8/8] tools, perf: Add asprintf replacement Andi Kleen
2014-10-20 18:28 ` Jiri Olsa [this message]
2014-10-20 19:13 ` Geert Uytterhoeven
2014-10-20 19:21 ` Jiri Olsa
2014-10-20 19:33 ` Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2014-09-15 23:54 Implement lbr-as-callgraph v9 Andi Kleen
2014-09-15 23:54 ` [PATCH 8/8] 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=20141020182818.GE9913@krava.brq.redhat.com \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=andi@firstfloor.org \
--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;
as well as URLs for NNTP newsgroup(s).