Commit a1639ce5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf_urgent_for_v6.16_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Borislav Petkov:

 - Revert uprobes to using CAP_SYS_ADMIN again as currently they can
   destructively modify kernel code from an unprivileged process

 - Move a warning to where it belongs

* tag 'perf_urgent_for_v6.16_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Revert to requiring CAP_SYS_ADMIN for uprobes
  perf/core: Fix the WARN_ON_ONCE is out of lock protected region
parents 5fc2e891 ba677dbe

kernel/events/core.c

+3 −3
Original line number Diff line number Diff line
@@ -951,8 +951,6 @@ static void perf_cgroup_switch(struct task_struct *task) 
	if (READ_ONCE(cpuctx->cgrp) == NULL)

		return;



	WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0);



	cgrp = perf_cgroup_from_task(task, NULL);

	if (READ_ONCE(cpuctx->cgrp) == cgrp)

		return;
@@ -964,6 +962,8 @@ static void perf_cgroup_switch(struct task_struct *task) 
	if (READ_ONCE(cpuctx->cgrp) == NULL)

		return;



	WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0);



	perf_ctx_disable(&cpuctx->ctx, true);



	ctx_sched_out(&cpuctx->ctx, NULL, EVENT_ALL|EVENT_CGROUP);
@@ -11116,7 +11116,7 @@ static int perf_uprobe_event_init(struct perf_event *event) 
	if (event->attr.type != perf_uprobe.type)

		return -ENOENT;



	if (!perfmon_capable())

	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;



	/*