Commit ec9dd352 authored Sep 18, 2017 by Yonghong Song Committed by David S. Miller Sep 20, 2017

bpf: one perf event close won't free bpf program attached by another perf event



This patch fixes a bug exhibited by the following scenario:
  1. fd1 = perf_event_open with attr.config = ID1
  2. attach bpf program prog1 to fd1
  3. fd2 = perf_event_open with attr.config = ID1
     <this will be successful>
  4. user program closes fd2 and prog1 is detached from the tracepoint.
  5. user program with fd1 does not work properly as tracepoint
     no output any more.

The issue happens at step 4. Multiple perf_event_open can be called
successfully, but only one bpf prog pointer in the tp_event. In the
current logic, any fd release for the same tp_event will free
the tp_event->prog.

The fix is to free tp_event->prog only when the closing fd
corresponds to the one which registered the program.

Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 008ba2a1

include/linux/trace_events.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -272,6 +272,7 @@ struct trace_event_call {
		int perf_refcount;
		struct hlist_head __percpu *perf_events;
		struct bpf_prog *prog;
		struct perf_event *bpf_prog_owner;

		int (perf_perm)(struct trace_event_call ,
		struct perf_event *);

kernel/events/core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -8171,6 +8171,7 @@ static int perf_event_set_bpf_prog(struct perf_event *event, u32 prog_fd)
		}
		}
		event->tp_event->prog = prog;
		event->tp_event->bpf_prog_owner = event;

		return 0;
		}
		@@ -8185,7 +8186,7 @@ static void perf_event_free_bpf_prog(struct perf_event *event)
		return;

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

Admin message