perfcounters fixes
Linus,
Please pull the latest perfcounters-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perfcounters-fixes-for-linus
Thanks,
Ingo
------------------>
Peter Zijlstra (2):
perf tools: Check perf.data owner
perf_counter: Fix typo in read() output generation
kernel/perf_counter.c | 2 +- tools/perf/builtin-annotate.c | 7 +++++++ tools/perf/builtin-report.c | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletions(-)
kernel/perf_counter.c +1 -1
@@ -1791,7 +1791,7 @@ static int perf_counter_read_group(struct perf_counter *counter, size += err;list_for_each_entry (sub, &leader->sibling_list, list_entry) { - err =perf_counter_read_entry (counter, read_format, + err =perf_counter_read_entry (sub, read_format, buf + size);if (err <0 )return err;
tools/perf/builtin-annotate.c +7 -0
@@ -31,6 +31,7 @@ static char *vmlinux = "vmlinux";static char default_sort_order[] ="comm,symbol" ;static char *sort_order = default_sort_order; +static int force;static int input;static int show_mask =SHOW_KERNEL |SHOW_USER |SHOW_HV ;
@@ -1334,6 +1335,11 @@ static int __cmd_annotate(void)exit (-1 ); } +if (!force && (stat.st_uid !=geteuid ())) { +fprintf (stderr,"file: %s not owned by current user\n" , input_name); +exit (-1 ); + } +if (!stat.st_size) {fprintf (stderr,"zero-sized file, nothing to do!\n" );exit (0 );
@@ -1439,6 +1445,7 @@ static const struct option options[] = { "input file name"),OPT_STRING ('s' ,"symbol" , &sym_hist_filter,"symbol" ,"symbol to annotate" ), +OPT_BOOLEAN ('f' ,"force" , &force,"don't complain, do it" ),OPT_BOOLEAN ('v' ,"verbose" , &verbose,"be more verbose (show symbol address, etc)" ), OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
tools/perf/builtin-report.c +7 -0
@@ -38,6 +38,7 @@ static char *dso_list_str, *comm_list_str, *sym_list_str,static struct strlist *dso_list, *comm_list, *sym_list;static char *field_sep; +static int force;static int input;static int show_mask =SHOW_KERNEL |SHOW_USER |SHOW_HV ;
@@ -1856,6 +1857,11 @@ static int __cmd_report(void)exit (-1 ); } +if (!force && (stat.st_uid !=geteuid ())) { +fprintf (stderr,"file: %s not owned by current user\n" , input_name); +exit (-1 ); + } +if (!stat.st_size) {fprintf (stderr,"zero-sized file, nothing to do!\n" );exit (0 );
@@ -2064,6 +2070,7 @@ static const struct option options[] = {OPT_BOOLEAN ('D' ,"dump-raw-trace" , &dump_trace,"dump raw trace in ASCII" ),OPT_STRING ('k' ,"vmlinux" , &vmlinux,"file" ,"vmlinux pathname" ), +OPT_BOOLEAN ('f' ,"force" , &force,"don't complain, do it" ),OPT_BOOLEAN ('m' ,"modules" , &modules,"load module symbols - WARNING: use only with -k and LIVE kernel" ), OPT_BOOLEAN('n', "show-nr-samples", &show_nr_samples,