Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753968Ab3EUMdt (ORCPT ); Tue, 21 May 2013 08:33:49 -0400 Received: from merlin.infradead.org ([205.233.59.134]:48757 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753167Ab3EUMds (ORCPT ); Tue, 21 May 2013 08:33:48 -0400 Date: Tue, 21 May 2013 13:08:58 +0200 From: Peter Zijlstra To: Stephane Eranian Cc: linux-kernel@vger.kernel.org, mingo@elte.hu, ak@linux.intel.com, jolsa@redhat.com Subject: Re: [PATCH] perf: check branch sampling priv level in generic code Message-ID: <20130521110858.GH26912@twins.programming.kicks-ass.net> References: <20130521105337.GA2879@quad> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130521105337.GA2879@quad> User-Agent: Mutt/1.5.21 (2012-12-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1914 Lines: 57 On Tue, May 21, 2013 at 12:53:37PM +0200, Stephane Eranian wrote: > > This patch reverts commit 7cc23cd: > perf/x86/intel/lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL > > The check is now implemented in generic code > instead of x86 specific code. That way we > do not have to repeat the test in each arch > supporting branch sampling. Good point indeed. > Signed-off-by: Stephane Eranian > --- > arch/x86/kernel/cpu/perf_event_intel_lbr.c | 13 +++---------- > kernel/events/core.c | 9 ++++----- > 2 files changed, 7 insertions(+), 15 deletions(-) > > diff --git a/kernel/events/core.c b/kernel/events/core.c > index 9dc297f..cf79c81 100644 > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -6327,11 +6327,6 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, > if (!(mask & ~PERF_SAMPLE_BRANCH_PLM_ALL)) > return -EINVAL; > > - /* kernel level capture: check permissions */ > - if ((mask & PERF_SAMPLE_BRANCH_PERM_PLM) > - && perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN)) > - return -EACCES; > - Oh hey, there was a check.. > /* propagate priv level, when not set for branch */ > if (!(mask & PERF_SAMPLE_BRANCH_PLM_ALL)) { > > @@ -6349,6 +6344,10 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, > */ > attr->branch_sample_type = mask; > } > + /* kernel level capture: check permissions */ > + if ((mask & PERF_SAMPLE_BRANCH_KERNEL) > + && perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN)) > + return -EACCES; > } > > if (attr->sample_type & PERF_SAMPLE_REGS_USER) { > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/