Skip to content

Commit 185891f

Browse files
nathanchanceSuzuki K Poulose
authored andcommitted
coresight: dummy: Update type of mode parameter in dummy_{sink,source}_enable()
Clang's kernel Control Flow Integrity (kCFI) is a compiler-based security mitigation that ensures the target of an indirect function call matches the expected type of the call and trapping if they do not match exactly. The warning -Wincompatible-function-pointer-types-strict aims to catch these issues at compile time, which reveals: drivers/hwtracing/coresight/coresight-dummy.c:53:12: error: incompatible function pointer types initializing 'int (*)(struct coresight_device *, struct perf_event *, enum cs_mode)' with an expression of type 'int (struct coresight_device *, struct perf_event *, u32)' (aka 'int (struct coresight_device *, struct perf_event *, unsigned int)') [-Werror,-Wincompatible-function-pointer-types-strict] 53 | .enable = dummy_source_enable, | ^~~~~~~~~~~~~~~~~~~ drivers/hwtracing/coresight/coresight-dummy.c:62:12: error: incompatible function pointer types initializing 'int (*)(struct coresight_device *, enum cs_mode, void *)' with an expression of type 'int (struct coresight_device *, u32, void *)' (aka 'int (struct coresight_device *, unsigned int, void *)') [-Werror,-Wincompatible-function-pointer-types-strict] 62 | .enable = dummy_sink_enable, | ^~~~~~~~~~~~~~~~~ 2 errors generated. Commit 9fa3682 ("coresight: Use enum type for cs_mode wherever possible") updated the type of the mode parameter in the prototype but this driver was not introduced until commit 9d3ba0b ("Coresight: Add coresight dummy driver") and 'int' is ABI compatible with 'enum cs_mode', so there is no warning from regular -Wincompatible-function-pointer-types. Adjust the type of the mode parameter in the callback implementations in the coresight dummy driver to match the prototype, clearing up the warning and avoiding kCFI failures at runtime. Fixes: 9d3ba0b ("Coresight: Add coresight dummy driver") Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Link: https://lore.kernel.org/r/20230616-coresight-dummy-fix-kcfi-warnings-v1-1-c55c64f8f0f5@kernel.org
1 parent 3b79104 commit 185891f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/hwtracing/coresight/coresight-dummy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DEFINE_CORESIGHT_DEVLIST(source_devs, "dummy_source");
2121
DEFINE_CORESIGHT_DEVLIST(sink_devs, "dummy_sink");
2222

2323
static int dummy_source_enable(struct coresight_device *csdev,
24-
struct perf_event *event, u32 mode)
24+
struct perf_event *event, enum cs_mode mode)
2525
{
2626
dev_dbg(csdev->dev.parent, "Dummy source enabled\n");
2727

@@ -34,7 +34,7 @@ static void dummy_source_disable(struct coresight_device *csdev,
3434
dev_dbg(csdev->dev.parent, "Dummy source disabled\n");
3535
}
3636

37-
static int dummy_sink_enable(struct coresight_device *csdev, u32 mode,
37+
static int dummy_sink_enable(struct coresight_device *csdev, enum cs_mode mode,
3838
void *data)
3939
{
4040
dev_dbg(csdev->dev.parent, "Dummy sink enabled\n");

0 commit comments

Comments
 (0)