Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82489c5f authored by Eugene Syromiatnikov's avatar Eugene Syromiatnikov Committed by Ingo Molnar
Browse files

perf/core: Wire up compat PERF_EVENT_IOC_QUERY_BPF, PERF_EVENT_IOC_MODIFY_ATTRIBUTES 



Since pointer size is different in compat, and switching in _perf_ioctl
is done using exact ioctl numbers, all new ioctl numbers that use pointer
should be added to perf_compat_ioctl for _IOC_SIZE fixup before passing
to perf_ioctl routine (this shouldn't be needed if semantics of the size
argument of _IO* macros was honored).

Signed-off-by: default avatarEugene Syromiatnikov <esyr@redhat.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
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: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/20180521123420.GA24291@asgard.redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9511bce9

kernel/events/core.c

+2 −0
Original line number Diff line number Diff line
@@ -5120,6 +5120,8 @@ static long perf_compat_ioctl(struct file *file, unsigned int cmd, 
	switch (_IOC_NR(cmd)) {

	case _IOC_NR(PERF_EVENT_IOC_SET_FILTER):

	case _IOC_NR(PERF_EVENT_IOC_ID):

	case _IOC_NR(PERF_EVENT_IOC_QUERY_BPF):

	case _IOC_NR(PERF_EVENT_IOC_MODIFY_ATTRIBUTES):

		/* Fix up pointer size (usually 4 -> 8 in 32-on-64-bit case */

		if (_IOC_SIZE(cmd) == sizeof(compat_uptr_t)) {

			cmd &= ~IOCSIZE_MASK;