Commit ad572d17 authored Jun 15, 2016 by Alexei Starovoitov Committed by David S. Miller Jun 15, 2016

bpf, trace: check event type in bpf_perf_event_read



similar to bpf_perf_event_output() the bpf_perf_event_read() helper
needs to check the type of the perf_event before reading the counter.

Fixes: a43eec30 ("bpf: introduce bpf_perf_event_output() helper")
Reported-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 19de99f7

kernel/trace/bpf_trace.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -209,6 +209,10 @@ static u64 bpf_perf_event_read(u64 r1, u64 index, u64 r3, u64 r4, u64 r5)
		event->pmu->count)
		return -EINVAL;

		if (unlikely(event->attr.type != PERF_TYPE_HARDWARE &&
		event->attr.type != PERF_TYPE_RAW))
		return -EINVAL;

		/*
		* we don't know if the function is run successfully by the
		* return value. It can be judged in other places, such as