Checking event's owner task permissions instead of 'current' process' ones. This way we get proper check when this is called from fork callback, where 'current' process does not represent the owner.
Checking parent event owner task in case of child event. Reported-by: Alexander Yarygin <[email protected]> Cc: Alexander Yarygin <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Jiri Olsa <[email protected]> --- kernel/events/core.c | 4 ++++ kernel/trace/trace_event_perf.c | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index faba9e0..c478828 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3315,6 +3315,10 @@ struct task_struct *perf_event_get_owner(struct perf_event *event) { struct task_struct *owner; + /* Only the parent holds owner task. */ + if (event->parent) + event = event->parent; + rcu_read_lock(); owner = ACCESS_ONCE(event->owner); /* diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 5d12bb4..35b76ec 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -21,9 +21,24 @@ typedef typeof(unsigned long [PERF_MAX_TRACE_SIZE / sizeof(unsigned long)]) /* Count the events in use (per event id, not per instance) */ static int total_ref_count; +static bool is_owner_admin(struct perf_event *event) +{ + struct task_struct *owner = perf_event_get_owner(event); + bool admin = false; + + if (owner) { + admin = has_capability(owner, CAP_SYS_ADMIN); + put_task_struct(owner); + } + + return admin; +} + static int perf_trace_event_perm(struct ftrace_event_call *tp_event, struct perf_event *p_event) { + bool admin = is_owner_admin(p_event); + if (tp_event->perf_perm) { int ret = tp_event->perf_perm(tp_event, p_event); if (ret) @@ -32,7 +47,7 @@ static int perf_trace_event_perm(struct ftrace_event_call *tp_event, /* The ftrace function trace is allowed only for root. */ if (ftrace_event_is_function(tp_event)) { - if (perf_paranoid_tracepoint_raw() && !capable(CAP_SYS_ADMIN)) + if (perf_paranoid_tracepoint_raw() && !admin) return -EPERM; /* @@ -65,7 +80,7 @@ static int perf_trace_event_perm(struct ftrace_event_call *tp_event, * ...otherwise raw tracepoint data can be a severe data leak, * only allow root to have these. */ - if (perf_paranoid_tracepoint_raw() && !capable(CAP_SYS_ADMIN)) + if (perf_paranoid_tracepoint_raw() && !admin) return -EPERM; return 0; -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
