powerpc/perf: Reject EBB events which specify a sample_type

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / perf / core-book3s.c

diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 53ac1b20e14dbaf401c9159228d1cc2af2e10abd..1e095fd68b6ca78ed3bf6f5edd2edd521e16e7f1 100644 (file)
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -503,8 +503,11 @@ static int ebb_event_check(struct perf_event *event)
                if (!leader->attr.pinned || !leader->attr.exclusive)
                        return -EINVAL;
 
-               if (event->attr.inherit || event->attr.sample_period ||
-                   event->attr.enable_on_exec || event->attr.freq)
+               if (event->attr.freq ||
+                   event->attr.inherit ||
+                   event->attr.sample_type ||
+                   event->attr.sample_period ||
+                   event->attr.enable_on_exec)
                        return -EINVAL;
        }