Commit ca76cc64 authored Oct 23, 2017 by Yonghong Song Committed by Connor O'Brien Dec 12, 2019

UPSTREAM: bpf: use the same condition in perf event set/free bpf handler



This is a cleanup such that doing the same check in
perf_event_free_bpf_prog as we already do in
perf_event_set_bpf_prog step.

Signed-off-by: Yonghong Song <yhs@fb.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0b4c6841fee03e096b735074a0c4aab3a8e92986)
Signed-off-by: Connor O'Brien <connoro@google.com>
Bug: 121213201
Bug: 138317270
Test: build & boot cuttlefish
Change-Id: Ie423e73a73be29e8ef50cc22dbb03e14e241c8de

parent 148f111e

kernel/events/core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -7940,10 +7940,10 @@ static void perf_event_free_bpf_prog(struct perf_event *event)
		{
		struct bpf_prog *prog;

		if (event->attr.type != PERF_TYPE_TRACEPOINT) {
		perf_event_free_bpf_handler(event);

		if (!event->tp_event)
		return;
		}

		prog = event->tp_event->prog;
		if (prog && event->tp_event->bpf_prog_owner == event) {