perf tools: do not complain if root is owning perf.data

This improves patch fa6963b24 so that perf.data stuff that has
been dumped as root can be read (annotate/report) by a user
without the use of the --force.

Rationale is that root has plenty of ways to screw us (usually)
that do not require twisted schemes involving specially
crafting a perf.data.

Signed-off-by: Pierre Habouzit <pierre.habouzit@intersec.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: <stable@kernel.org>
LKML-Reference: <20090827075902.GF19653@laphroaig.corp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 4 insertions, 4 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 4ac618b34254..4c7bc4436236 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -984,8 +984,8 @@ static int __cmd_annotate(void)
                 exit(-1);
         }
 
-        if (!force && (input_stat.st_uid != geteuid())) {
-                fprintf(stderr, "file: %s not owned by current user\n", input_name);
+        if (!force && input_stat.st_uid && (input_stat.st_uid != geteuid())) {
+                fprintf(stderr, "file: %s not owned by current user or root\n", input_name);
                 exit(-1);
         }
 
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index d2e28820ee60..ea6328a893cc 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -1405,8 +1405,8 @@ static int __cmd_report(void)
                 exit(-1);
         }
 
-        if (!force && (input_stat.st_uid != geteuid())) {
-                fprintf(stderr, "file: %s not owned by current user\n", input_name);
+        if (!force && input_stat.st_uid && (input_stat.st_uid != geteuid())) {
+                fprintf(stderr, "file: %s not owned by current user or root\n", input_name);
                 exit(-1);
         }