Messages in this thread | | | Date | Wed, 15 May 2013 16:30:19 +0200 | From | Peter Zijlstra <> | Subject | Re: [PATCH 3/3] perf, x86, lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL |
| |
On Wed, May 15, 2013 at 03:37:22PM +0200, Stephane Eranian wrote: > On Fri, May 3, 2013 at 2:11 PM, Peter Zijlstra <a.p.zijlstra@chello.nl> wrote: > > We should always have proper privileges when requesting kernel data. > > > > Cc: Andi Kleen <ak@linux.intel.com> > > Cc: eranian@google.com > > Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> > > Link: http://lkml.kernel.org/n/tip-v0x9ky3ahzr6nm3c6ilwrili@git.kernel.org > > --- > > arch/x86/kernel/cpu/perf_event_intel_lbr.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > --- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c > > +++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c > > @@ -318,8 +318,11 @@ static void intel_pmu_setup_sw_lbr_filte > > if (br_type & PERF_SAMPLE_BRANCH_USER) > > mask |= X86_BR_USER; > > > > - if (br_type & PERF_SAMPLE_BRANCH_KERNEL) > > + if (br_type & PERF_SAMPLE_BRANCH_KERNEL) { > > + if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN)) > > + return -EACCES; > > mask |= X86_BR_KERNEL; > > + } > > > This will prevent regular users from capturing kernel -> kernel branches. > But it won't prevent users from getting kernel -> user branches. Thus > some kernel address will still be captured. I guess they could be eliminated > by the sw_filter. > > When using LBR priv level filtering, the filter applies to the branch target > only.
Ah, indeed. I'll try and whip up a patch.
| |