Skip to content

Commit 0a5b412

Browse files
samitolvanenkees
authored andcommitted
kthread: use WARN_ON_FUNCTION_MISMATCH
With CONFIG_CFI_CLANG, a callback function passed to __kthread_queue_delayed_work from a module points to a jump table entry defined in the module instead of the one used in the core kernel, which breaks function address equality in this check: WARN_ON_ONCE(timer->function != ktead_delayed_work_timer_fn); Use WARN_ON_FUNCTION_MISMATCH() instead to disable the warning when CFI and modules are both enabled. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Tested-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20210408182843.1754385-7-samitolvanen@google.com
1 parent 9817311 commit 0a5b412

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

kernel/kthread.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,8 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker,
963963
struct timer_list *timer = &dwork->timer;
964964
struct kthread_work *work = &dwork->work;
965965

966-
WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn);
966+
WARN_ON_FUNCTION_MISMATCH(timer->function,
967+
kthread_delayed_work_timer_fn);
967968

968969
/*
969970
* If @delay is 0, queue @dwork->work immediately. This is for

0 commit comments

Comments
 (0)