From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC3DDC33CB3 for ; Thu, 16 Jan 2020 18:06:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA5B724695 for ; Thu, 16 Jan 2020 18:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579197999; bh=nE8tPGjSW5CKjuG7EIq5pE1gP4D2PGDFzgn5v05tthE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=csGfRVn20PCeSEiGTmqgdisc0gJnAK6ReKV+iK154644XLEJLOPjyW/SrWcmm16et NKRtPGdTCB24IaBCllcaUwhqbRWOJeG0H69J2q5m5Q8hU1244bodYegKuQLYEwKGiT gH45MLbifyXvV5bNn39iIzAUDiiwqwCODPyEVtJw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394970AbgAPSGh (ORCPT ); Thu, 16 Jan 2020 13:06:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:55928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390761AbgAPRje (ORCPT ); Thu, 16 Jan 2020 12:39:34 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C809724706; Thu, 16 Jan 2020 17:39:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196373; bh=nE8tPGjSW5CKjuG7EIq5pE1gP4D2PGDFzgn5v05tthE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=11tBIxcQ+C0fMXZ5d1u/mloUqB6g57WnLDs/md7nGSdTkBPSRQj5WpqHhbM3xjpGO JKpiupTjp04uYeQoMztTrE+IxJ5S/Y+QRhgDZMdJdB8cFkGxkFwI6NbiVi6j0y4s1a Mt0gtLGwvfFma/1ZBEqXAmupxFaEd16C0dehQ37w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ravi Bangoria , Peter Zijlstra , Alexander Shishkin , Arnaldo Carvalho de Melo , Jiri Olsa , Linus Torvalds , Stephane Eranian , Thomas Gleixner , Vince Weaver , acme@kernel.org, linuxppc-dev@lists.ozlabs.org, maddy@linux.vnet.ibm.com, mpe@ellerman.id.au, Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.9 159/251] perf/ioctl: Add check for the sample_period value Date: Thu, 16 Jan 2020 12:35:08 -0500 Message-Id: <20200116173641.22137-119-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ravi Bangoria [ Upstream commit 913a90bc5a3a06b1f04c337320e9aeee2328dd77 ] perf_event_open() limits the sample_period to 63 bits. See: 0819b2e30ccb ("perf: Limit perf_event_attr::sample_period to 63 bits") Make ioctl() consistent with it. Also on PowerPC, negative sample_period could cause a recursive PMIs leading to a hang (reported when running perf-fuzzer). Signed-off-by: Ravi Bangoria Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: acme@kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: maddy@linux.vnet.ibm.com Cc: mpe@ellerman.id.au Fixes: 0819b2e30ccb ("perf: Limit perf_event_attr::sample_period to 63 bits") Link: https://lkml.kernel.org/r/20190604042953.914-1-ravi.bangoria@linux.ibm.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/events/core.c b/kernel/events/core.c index 5bbf7537a612..64ace5e9af2a 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -4624,6 +4624,9 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg) if (perf_event_check_period(event, value)) return -EINVAL; + if (!event->attr.freq && (value & (1ULL << 63))) + return -EINVAL; + event_function_call(event, __perf_event_period, &value); return 0; -- 2.20.1