From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-488755-1524652601-2-12079778223393292509 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1524652600; b=h9Y90rx1fi/Dpfu2fNZgdwq4hDZSqgZCbF31HKfc0uee57qbv2 EL5NIBim4aAyaaG9VZRxeJwbNOzAPwdHUKg5yvtjP65jYpYh36a+XXhKcNTpZQm/ pdhN7+jrAmp/jdFoRiREXfA6Ccl4hSFZP1m2reB3Q33qV0FyOO3wKgHlIe/TTWWc AuVVkLfCZv4boXbUtBauiyrfcBXfkIVt0xjZAQpqUljVJmO4hI3Aj4j596HjPP4q TOgGF2gQWjHqzhk2k5Lvcj03ponKN1WaUxxTeRAvPOPE1Nnm5mv8gVSMbtp1rUzl jwTeAVhqSWiROOeq0C9QmlVxyZa//uraFMAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1524652600; bh=VUwOEjDz6BbNLBtH4EW+hcCA7UX8t0 5emRV6q7Z2kwQ=; b=pSQmmLka0N0xm9JDjbWuXob6HpQ6k3ngIqJjw/NKxYxln8 DA83SLGtieKiwnuyqtyafazTJjM5JshfFAmo2x0soNentY5Iu11TTyyvbpQ2/N5+ 26qKmCi2w/OKgy/gNipJ0DZUYzbyzVyJHf3QyeXV2yx7jW5rQcHXOGmDmE93x6T6 sH1xL1dQUuYRHX6FLaj/xDsX49CRt2qIhdSXAsboiyItE45Y4lgpBOrawA6lxHDd bWjfzqNoHkTZWFiGTREuUekB8heLMPcl0Cy7DAmZ54gu7xRotbs7mRHnX628Fpo5 hi34fV3t35q4izi1HCNqBXpm4/XY5Mu1NA5GcRiw== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfKlj/flPAx2amOgSUv+zoKldwj0XJhNrUFykQ5gxraKhmIBFL/hR9WygdDbYklFzWrH9bwHlJ0snVy7WVX02uPrV8V7KARL4b5VdcYgNxhTwhpZN6PvR Zoz8pwzkiujHFrsFGyJEGz2M4bohG3yS89WGfuSmEdpTJmLzxDsLb1MCNS2cbwo3jfGMQPswdAtQHgFk9Ec/MDhvCMu/0kuxK/4KOnMHD1inIJEg2m5TWORE X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=VwQbUJbxAAAA:8 a=QyXUC8HyAAAA:8 a=WfulkdPnAAAA:8 a=oGMlB6cnAAAA:8 a=JfrnYn6hAAAA:8 a=1XWaLZrsAAAA:8 a=4RBUngkUAAAA:8 a=20KFwNOVAAAA:8 a=ag1SF4gXAAAA:8 a=5pElJeHA-yHr_syu1SgA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=56QPVbyS4OZCpcuOg7Z9:22 a=NdAtdrkLVvyUPsUoGJp4:22 a=1CNFftbPRP8L7MoqJWF3:22 a=_sbA2Q-Kp09kWB8D3iXc:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752261AbeDYKg1 (ORCPT ); Wed, 25 Apr 2018 06:36:27 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:50906 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752431AbeDYKef (ORCPT ); Wed, 25 Apr 2018 06:34:35 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Olsa , Alexander Shishkin , Andi Kleen , "H. Peter Anvin" , Namhyung Kim , Peter Zijlstra , Stephane Eranian , Thomas Gleixner , syzkaller-bugs@googlegroups.com, x86@kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 4.16 24/26] perf: Return proper values for user stack errors Date: Wed, 25 Apr 2018 12:33:33 +0200 Message-Id: <20180425103315.809210197@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425103314.842517924@linuxfoundation.org> References: <20180425103314.842517924@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiri Olsa commit 78b562fbfa2cf0a9fcb23c3154756b690f4905c1 upstream. Return immediately when we find issue in the user stack checks. The error value could get overwritten by following check for PERF_SAMPLE_REGS_INTR. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: H. Peter Anvin Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: syzkaller-bugs@googlegroups.com Cc: x86@kernel.org Fixes: 60e2364e60e8 ("perf: Add ability to sample machine state on interrupt") Link: http://lkml.kernel.org/r/20180415092352.12403-1-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- kernel/events/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9730,9 +9730,9 @@ static int perf_copy_attr(struct perf_ev * __u16 sample size limit. */ if (attr->sample_stack_user >= USHRT_MAX) - ret = -EINVAL; + return -EINVAL; else if (!IS_ALIGNED(attr->sample_stack_user, sizeof(u64))) - ret = -EINVAL; + return -EINVAL; } if (attr->sample_type & PERF_SAMPLE_REGS_INTR)