perf/x86: fix sysfs type mismatches

Browse source

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

...

This commit is contained in:

Sami Tolvanen 2020-11-13 10:31:26 -08:00 • committed by Peter Zijlstra

parent 1a8cfa24e2

commit ebd19fc372

4 changed files with 12 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/x86/events/intel/cstate.c

View file

4

arch/x86/events/intel/uncore.c

View file

12

arch/x86/events/intel/uncore.h

View file

14

arch/x86/events/rapl.c

View file