LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Jiri Olsa <jolsa@kernel.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Andi Kleen <andi@firstfloor.org>,
	"H . Peter Anvin" <hpa@zytor.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Stephane Eranian <eranian@google.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	syzkaller-bugs@googlegroups.com, x86@kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 06/17] perf: Return proper values for user stack errors
Date: Fri, 20 Apr 2018 11:32:16 -0300	[thread overview]
Message-ID: <20180420143227.16030-7-acme@kernel.org> (raw)
In-Reply-To: <20180420143227.16030-1-acme@kernel.org>

From: Jiri Olsa <jolsa@kernel.org>

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 <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
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 <acme@redhat.com>
---
 kernel/events/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 1bae80aaabfb..67612ce359ad 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10209,9 +10209,9 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
 		 * __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_max_stack)
-- 
2.14.3

  parent reply	other threads:[~2018-04-20 14:33 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-20 14:32 [GIT PULL 00/17] perf/urgent fixes and improvements Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 02/17] perf/core: Store context switch out type in PERF_RECORD_SWITCH[_CPU_WIDE] Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 03/17] perf report: Extend raw dump (-D) out with switch out event type Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 04/17] perf script: Extend misc field decoding " Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 05/17] perf list: Add s390 support for detailed/verbose PMU event description Arnaldo Carvalho de Melo
2018-04-20 14:32 ` Arnaldo Carvalho de Melo [this message]
2018-04-20 14:32 ` [PATCH 07/17] perf: Fix sample_max_stack maximum check Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 08/17] perf: Remove superfluous allocation error check Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 09/17] perf trace: Support MAP_FIXED_NOREPLACE Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 10/17] perf mem: Allow all record/report options Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 11/17] perf hists browser: Clarify top/report browser help Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 12/17] perf record: Remove misleading error suggestion Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 13/17] perf record: Remove suggestion to enable APIC Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 14/17] perf tools: Add '\n' at the end of parse-options error messages Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 15/17] perf tests mmap: Show which tracepoint is failing Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 16/17] perf test BPF: Fixup BPF test using epoll_pwait syscall function probe Arnaldo Carvalho de Melo
2018-04-20 14:32 ` [PATCH 17/17] coresight: Move to SPDX identifier Arnaldo Carvalho de Melo
2018-04-21  7:39 ` [GIT PULL 00/17] perf/urgent fixes and improvements Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180420143227.16030-7-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=andi@firstfloor.org \
    --cc=eranian@google.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=syzkaller-bugs@googlegroups.com \
    --cc=tglx@linutronix.de \
    --cc=williams@redhat.com \
    --cc=x86@kernel.org \
    --subject='Re: [PATCH 06/17] perf: Return proper values for user stack errors' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).