tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

workqueue: use WARN_ON_FUNCTION_MISMATCH

With CONFIG_CFI_CLANG, a callback function passed to
__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 != 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-6-samitolvanen@google.com

authored by

Sami Tolvanen and committed by
Kees Cook 98173112 28aad1c2

+1 -1
+1 -1
kernel/workqueue.c
··· 1630 1630 struct work_struct *work = &dwork->work; 1631 1631 1632 1632 WARN_ON_ONCE(!wq); 1633 - WARN_ON_ONCE(timer->function != delayed_work_timer_fn); 1633 + WARN_ON_FUNCTION_MISMATCH(timer->function, delayed_work_timer_fn); 1634 1634 WARN_ON_ONCE(timer_pending(timer)); 1635 1635 WARN_ON_ONCE(!list_empty(&work->entry)); 1636 1636