tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds a1639ce5 5fc2e891

+3 -3
+3 -3
kernel/events/core.c
··· 951 951 if (READ_ONCE(cpuctx->cgrp) == NULL) 952 952 return; 953 953 954 - WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0); 955 - 956 954 cgrp = perf_cgroup_from_task(task, NULL); 957 955 if (READ_ONCE(cpuctx->cgrp) == cgrp) 958 956 return; ··· 961 963 */ 962 964 if (READ_ONCE(cpuctx->cgrp) == NULL) 963 965 return; 966 + 967 + WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0); 964 968 965 969 perf_ctx_disable(&cpuctx->ctx, true); 966 970 ··· 11116 11116 if (event->attr.type != perf_uprobe.type) 11117 11117 return -ENOENT; 11118 11118 11119 - if (!perfmon_capable()) 11119 + if (!capable(CAP_SYS_ADMIN)) 11120 11120 return -EACCES; 11121 11121 11122 11122 /*