Skip to content

Commit

Permalink
perf/core: Start rejecting the syscall with attr.__reserved_2 set
Browse files Browse the repository at this point in the history
Commit:

  1a59413 ("perf: Add wakeup watermark control to the AUX area")

added attr.__reserved_2 padding, but forgot to add an ABI check to reject
attributes with this field set. Fix that.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: adrian.hunter@intel.com
Cc: mathieu.poirier@linaro.org
Link: https://lkml.kernel.org/r/20191025121636.75182-1-alexander.shishkin@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
virtuoso authored and Ingo Molnar committed Oct 28, 2019
1 parent d6d5df1 commit 8c7e975
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/events/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -10635,7 +10635,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,

attr->size = size;

if (attr->__reserved_1)
if (attr->__reserved_1 || attr->__reserved_2)
return -EINVAL;

if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))
Expand Down

0 comments on commit 8c7e975

Please sign in to comment.