[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5693BA78.70606@cogentembedded.com>
Date: Mon, 11 Jan 2016 17:21:44 +0300
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Wang Nan <wangnan0@...wei.com>, acme@...nel.org
Cc: linux-kernel@...r.kernel.org, pi3orama@....com, lizefan@...wei.com,
netdev@...r.kernel.org, davem@...emloft.net,
He Kuang <hekuang@...wei.com>,
Arnaldo Carvalho de Melo <acme@...hat.com>,
Jiri Olsa <jolsa@...nel.org>,
Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>,
Namhyung Kim <namhyung@...nel.org>
Subject: Re: [PATCH 42/53] perf record: Prevent reading invalid data in
record__mmap_read
Hello.
On 01/11/2016 04:48 PM, Wang Nan wrote:
> When record__mmap_read() require data more than the size of ring
> buffer, drop those data to avoid access invalid memory.
>
> This can happen when reading from overwritable ring buffer, which
> should be avoided. However, check this for robustness.
>
> Signed-off-by: Wang Nan <wangnan0@...wei.com>
> Signed-off-by: He Kuang <hekuang@...wei.com>
> Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
> Cc: Jiri Olsa <jolsa@...nel.org>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
> Cc: Namhyung Kim <namhyung@...nel.org>
> Cc: Zefan Li <lizefan@...wei.com>
> Cc: pi3orama@....com
> ---
> tools/perf/builtin-record.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index b65b41f..3f58426 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -37,6 +37,7 @@
> #include <unistd.h>
> #include <sched.h>
> #include <sys/mman.h>
> +#include <asm/bug.h>
>
>
> struct record {
> @@ -94,6 +95,13 @@ static int record__mmap_read(struct record *rec, int idx)
> rec->samples++;
>
> size = head - old;
> + if (size > (unsigned long)(md->mask) + 1) {
> + WARN_ONCE(1, "WARNING: failed to keep up with mmap data. (warn only once)\n");
WARNING is already printed by WARN*(), no?
[...]
MBR, Sergei
Powered by blists - more mailing lists