Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0022cedd authored by Vince Weaver's avatar Vince Weaver Committed by Ingo Molnar
Browse files

perf/trace: Properly use u64 to hold event_id 



The 64-bit attr.config value for perf trace events was being copied into
an "int" before doing a comparison, meaning the top 32 bits were
being truncated.

As far as I can tell this didn't cause any errors, but it did mean
it was possible to create valid aliases for all the tracepoint ids
which I don't think was intended.  (For example, 0xffffffff00000018
and 0x18 both enable the same tracepoint).

Signed-off-by: default avatarVince Weaver <vincent.weaver@maine.edu>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1311151236100.11932@vincent-weaver-1.um.maine.edu


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 06db0b21

kernel/trace/trace_event_perf.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int perf_trace_event_init(struct ftrace_event_call *tp_event, 
int perf_trace_init(struct perf_event *p_event)

{

	struct ftrace_event_call *tp_event;

	int event_id = p_event->attr.config;

	u64 event_id = p_event->attr.config;

	int ret = -EINVAL;



	mutex_lock(&event_mutex);