2019-10-25 20:04:45

by Alexander Shishkin

Subject: [PATCH] perf: Start rejecting the syscall with attr.__reserved_2 set

Commit

1a5941312414c ("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]>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 77793ef0d8bc..0940c8810be0 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10660,7 +10660,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))
--
2.23.0

2019-10-29 01:33:08

by tip-bot2 for Alexey Makhalov

Subject: [tip: perf/urgent] perf/core: Start rejecting the syscall with attr.__reserved_2 set

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID: 8c7e975667fbc3b7c816119dd56104739899f125
Gitweb: https://git.kernel.org/tip/8c7e975667fbc3b7c816119dd56104739899f125
Author: Alexander Shishkin <[email protected]>
AuthorDate: Fri, 25 Oct 2019 15:16:36 +03:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Mon, 28 Oct 2019 11:01:59 +01:00

perf/core: Start rejecting the syscall with attr.__reserved_2 set

Commit:

1a5941312414c ("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]>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index bb3748d..aec8dba 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -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))