Merge "trace: fix race in perf_trace_buf initialization" (62eef5de) · Commits · e / devices / android_kernel_fairphone_FP4

kernel/trace/trace_event_perf.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -272,9 +272,11 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe)
		goto out;
		}

		mutex_lock(&event_mutex);
		ret = perf_trace_event_init(tp_event, p_event);
		if (ret)
		destroy_local_trace_kprobe(tp_event);
		mutex_unlock(&event_mutex);
		out:
		kfree(func);
		return ret;
		@@ -282,8 +284,10 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe)

		void perf_kprobe_destroy(struct perf_event *p_event)
		{
		mutex_lock(&event_mutex);
		perf_trace_event_close(p_event);
		perf_trace_event_unreg(p_event);
		mutex_unlock(&event_mutex);

		destroy_local_trace_kprobe(p_event->tp_event);
		}