Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762010Ab3ECMUl (ORCPT ); Fri, 3 May 2013 08:20:41 -0400 Received: from 173-166-109-252-newengland.hfc.comcastbusiness.net ([173.166.109.252]:47110 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761576Ab3ECMUZ (ORCPT ); Fri, 3 May 2013 08:20:25 -0400 Message-Id: <20130503121256.230745028@chello.nl> User-Agent: quilt/0.48-1 Date: Fri, 03 May 2013 14:11:25 +0200 From: Peter Zijlstra To: mingo@kernel.org Cc: linux-kernel@vger.kernel.org, ak@linux.intel.com, eranian@google.com, Peter Zijlstra Subject: [PATCH 3/3] perf, x86, lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL References: <20130503121122.931661809@chello.nl> Content-Disposition: inline; filename=peterz-perf-x86-lbr-priv.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1076 Lines: 32 We should always have proper privileges when requesting kernel data. Cc: Andi Kleen Cc: eranian@google.com Signed-off-by: Peter Zijlstra 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; + } /* we ignore BRANCH_HV here */ -- 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/