Commit 78b562fb authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf: Return proper values for user stack errors

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: default avatarJiri 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: 60e2364e ("perf: Add ability to sample machine state on interrupt")
Link: http://lkml.kernel.org/r/20180415092352.12403-1-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 038586c3
...@@ -10209,9 +10209,9 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, ...@@ -10209,9 +10209,9 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
* __u16 sample size limit. * __u16 sample size limit.
*/ */
if (attr->sample_stack_user >= USHRT_MAX) if (attr->sample_stack_user >= USHRT_MAX)
ret = -EINVAL; return -EINVAL;
else if (!IS_ALIGNED(attr->sample_stack_user, sizeof(u64))) else if (!IS_ALIGNED(attr->sample_stack_user, sizeof(u64)))
ret = -EINVAL; return -EINVAL;
} }
if (!attr->sample_max_stack) if (!attr->sample_max_stack)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment