perf/x86: fix sysfs type mismatches
authorSami Tolvanen <samitolvanen@google.com>
Fri, 13 Nov 2020 18:31:26 +0000 (10:31 -0800)
committerPeter Zijlstra <peterz@infradead.org>
Tue, 17 Nov 2020 12:15:38 +0000 (13:15 +0100)
commitebd19fc372e3e78bf165f230e7c084e304441c08
tree1457a5636b1f6f0ed0fca74b32029024b647ff2e
parent1a8cfa24e21c2f154791f0cdd85fc28496918722
perf/x86: fix sysfs type mismatches

This change switches rapl to use PMU_FORMAT_ATTR, and fixes two other
macros to use device_attribute instead of kobj_attribute to avoid
callback type mismatches that trip indirect call checking with Clang's
Control-Flow Integrity (CFI).

Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20201113183126.1239404-1-samitolvanen@google.com
arch/x86/events/intel/cstate.c
arch/x86/events/intel/uncore.c
arch/x86/events/intel/uncore.h
arch/x86/events/rapl.c