From patchwork Fri Jul 19 18:51:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Salveti de Araujo X-Patchwork-Id: 260325 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 6C6052C0040 for ; Sat, 20 Jul 2013 04:51:36 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1V0Fm5-0002Su-JY; Fri, 19 Jul 2013 18:51:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1V0Flk-0002Np-PE for kernel-team@lists.ubuntu.com; Fri, 19 Jul 2013 18:51:08 +0000 Received: from [186.214.76.52] (helo=evatp.domonet) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1V0Flk-0000Na-Ay for kernel-team@lists.ubuntu.com; Fri, 19 Jul 2013 18:51:08 +0000 From: Ricardo Salveti de Araujo To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/7] perf: Treat attr.config as u64 in perf_swevent_init() Date: Fri, 19 Jul 2013 15:51:03 -0300 Message-Id: <1374259863-31477-1-git-send-email-ricardo.salveti@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1374259379-31107-1-git-send-email-ricardo.salveti@canonical.com> References: <1374259379-31107-1-git-send-email-ricardo.salveti@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Tommi Rantala Trinity discovered that we fail to check all 64 bits of attr.config passed by user space, resulting to out-of-bounds access of the perf_swevent_enabled array in sw_perf_event_destroy(). Introduced in commit b0a873ebb ("perf: Register PMU implementations"). Change-Id: I9a46294b3732d5e04b14142f2e50b22a43ebc986 Signed-off-by: Tommi Rantala Cc: Peter Zijlstra Cc: davej@redhat.com Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Link: http://lkml.kernel.org/r/1365882554-30259-1-git-send-email-tt.rantala@gmail.com Signed-off-by: Ingo Molnar Signed-off-by: Ricardo Salveti de Araujo 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 32a6151..e1558f6 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5432,7 +5432,7 @@ static void sw_perf_event_destroy(struct perf_event *event) static int perf_swevent_init(struct perf_event *event) { - int event_id = event->attr.config; + u64 event_id = event->attr.config; if (event->attr.type != PERF_TYPE_SOFTWARE) return -ENOENT;