From: David Laight <David.Laight@ACULAB.COM>
To: "'cphlipot0@gmail.com'" <cphlipot0@gmail.com>,
"namhyung@kernel.org" <namhyung@kernel.org>,
"acme@kernel.org" <acme@kernel.org>
Cc: "peterz@infradead.org" <peterz@infradead.org>,
"mingo@redhat.com" <mingo@redhat.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] perf event-parse: Use fixed size string for comms
Date: Thu, 30 Aug 2018 15:28:18 +0000 [thread overview]
Message-ID: <0a4dba94bdbb41929350fe5504ee24bb@AcuMS.aculab.com> (raw)
In-Reply-To: <20180830021950.15563-1-cphlipot0@gmail.com>
From: cphlipot0@gmail.com
> Sent: 30 August 2018 03:20
>
> Some implementations of libc do not support the 'm' width modifier
> as part of the scanf string format specifier. This can cause the
> parsing to fail. Since the parser never checks if the scanf
> parsing was successesful, this can result in a crash.
>
> Change the comm string to be allocated as a fixed size instead of
> dynamically using 'm' scanf width modifier. This can be safely done
> since comm size is limited to 16 bytes by TASK_COMM_LEN within the
> kernel.
>
> This change prevents perf from crashing when linked against bionic
> as well as reduces the total number of heap allocations and frees
> invoked while accomplishing the same task.
>
> Signed-off-by: Chris Phlipot <cphlipot0@gmail.com>
> ---
> tools/perf/util/trace-event-parse.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
> index 920b1d58a068..e76214f8d596 100644
> --- a/tools/perf/util/trace-event-parse.c
> +++ b/tools/perf/util/trace-event-parse.c
> @@ -164,16 +164,15 @@ void parse_ftrace_printk(struct tep_handle *pevent,
> void parse_saved_cmdline(struct tep_handle *pevent,
> char *file, unsigned int size __maybe_unused)
> {
> - char *comm;
> + char comm[17]; /* Max comm length in the kernel is 16. */
> char *line;
> char *next = NULL;
> int pid;
>
> line = strtok_r(file, "\n", &next);
> while (line) {
> - sscanf(line, "%d %ms", &pid, &comm);
> - tep_register_comm(pevent, comm, pid);
> - free(comm);
> + if (sscanf(line, "%d %16s", &pid, comm) == 2)
> + tep_register_comm(pevent, comm, pid);
> line = strtok_r(NULL, "\n", &next);
Seems to me that sscanf is the wrong tool for the job (as usual).
Why not just:
pid = strtoul(line, &comm, 10);
while (*comm == ' ')
comm++;
tep_register_comm(pevent, comm, pid);
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
next prev parent reply other threads:[~2018-08-30 15:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-30 2:19 cphlipot0
2018-08-30 15:28 ` David Laight [this message]
2018-09-06 13:06 ` [tip:perf/core] " tip-bot for Chris Phlipot
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=0a4dba94bdbb41929350fe5504ee24bb@AcuMS.aculab.com \
--to=david.laight@aculab.com \
--cc=acme@kernel.org \
--cc=cphlipot0@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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