[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-913a90bc5a3a06b1f04c337320e9aeee2328dd77@git.kernel.org>
Date: Tue, 25 Jun 2019 01:19:09 -0700
From: tip-bot for Ravi Bangoria <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: jolsa@...hat.com, hpa@...or.com, peterz@...radead.org,
alexander.shishkin@...ux.intel.com, eranian@...gle.com,
mingo@...nel.org, ravi.bangoria@...ux.ibm.com,
linux-kernel@...r.kernel.org, tglx@...utronix.de,
vincent.weaver@...ne.edu, acme@...hat.com,
torvalds@...ux-foundation.org
Subject: [tip:perf/urgent] perf/ioctl: Add check for the sample_period value
Commit-ID: 913a90bc5a3a06b1f04c337320e9aeee2328dd77
Gitweb: https://git.kernel.org/tip/913a90bc5a3a06b1f04c337320e9aeee2328dd77
Author: Ravi Bangoria <ravi.bangoria@...ux.ibm.com>
AuthorDate: Tue, 4 Jun 2019 09:59:53 +0530
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 24 Jun 2019 19:19:22 +0200
perf/ioctl: Add check for the sample_period value
perf_event_open() limits the sample_period to 63 bits. See:
0819b2e30ccb ("perf: Limit perf_event_attr::sample_period to 63 bits")
Make ioctl() consistent with it.
Also on PowerPC, negative sample_period could cause a recursive
PMIs leading to a hang (reported when running perf-fuzzer).
Signed-off-by: Ravi Bangoria <ravi.bangoria@...ux.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vince Weaver <vincent.weaver@...ne.edu>
Cc: acme@...nel.org
Cc: linuxppc-dev@...ts.ozlabs.org
Cc: maddy@...ux.vnet.ibm.com
Cc: mpe@...erman.id.au
Fixes: 0819b2e30ccb ("perf: Limit perf_event_attr::sample_period to 63 bits")
Link: https://lkml.kernel.org/r/20190604042953.914-1-ravi.bangoria@linux.ibm.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/events/core.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 2e32faac5511..8d1c62df20a7 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5005,6 +5005,9 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)
if (perf_event_check_period(event, value))
return -EINVAL;
+ if (!event->attr.freq && (value & (1ULL << 63)))
+ return -EINVAL;
+
event_function_call(event, __perf_event_period, &value);
return 0;
Powered by blists - more mailing lists