From: Wang Nan [mailto:wangn...@huawei.com] > >On kernel with only one of CONFIG_KPROBE_EVENTS and >CONFIG_UPROBE_EVENTS enabled, 'perf probe -d' causes segfault because >perf_del_probe_events() calls probe_file__get_events() with a negative >fd. > >This patch fixes it by add parameter validation at the entry of >probe_file__get_events() and probe_file__get_rawlist(). Since they are >both non-static public functions (in .h file), parameter verifying >is required.
Looks good to me ! :) Acked-by: Masami Hiramatsu <masami.hiramatsu...@hitachi.com> Thank you! > >v1 -> v2: Verify fd at the head of probe_file__get_rawlist() instead of > checking at call site (suggested by Masami and Arnaldo at [1,2]). > >[1] >http://lkml.kernel.org/r/50399556c9727b4d88a595c8584aab3752604...@gsjptkydcembx32.service.hitachi.net >[2] http://lkml.kernel.org/r/20151105155830.gv13...@kernel.org > >Signed-off-by: Wang Nan <wangn...@huawei.com> >Cc: Arnaldo Carvalho de Melo <a...@redhat.com> >Cc: Jiri Olsa <jo...@kernel.org> >Cc: Masami Hiramatsu <masami.hiramatsu...@hitachi.com> >Cc: Namhyung Kim <namhy...@kernel.org> >--- > tools/perf/util/probe-file.c | 6 ++++++ > 1 file changed, 6 insertions(+) > >diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c >index 89dbeb9..e3b3b92 100644 >--- a/tools/perf/util/probe-file.c >+++ b/tools/perf/util/probe-file.c >@@ -138,6 +138,9 @@ struct strlist *probe_file__get_rawlist(int fd) > char *p; > struct strlist *sl; > >+ if (fd < 0) >+ return NULL; >+ > sl = strlist__new(NULL, NULL); > > fp = fdopen(dup(fd), "r"); >@@ -271,6 +274,9 @@ int probe_file__get_events(int fd, struct strfilter >*filter, > const char *p; > int ret = -ENOENT; > >+ if (!plist) >+ return -EINVAL; >+ > namelist = __probe_file__get_namelist(fd, true); > if (!namelist) > return -ENOENT; >-- >1.8.3.4
