Skip to content

Commit 8c7e975

Browse files
virtuosoIngo Molnar
authored andcommitted
perf/core: Start rejecting the syscall with attr.__reserved_2 set
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 <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vince Weaver <[email protected]> Cc: [email protected] Cc: [email protected] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent d6d5df1 commit 8c7e975

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/events/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10635,7 +10635,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
1063510635

1063610636
attr->size = size;
1063710637

10638-
if (attr->__reserved_1)
10638+
if (attr->__reserved_1 || attr->__reserved_2)
1063910639
return -EINVAL;
1064010640

1064110641
if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))

0 commit comments

Comments
 (0)