Pull CFI on arm64 support from Kees Cook: "This builds on last cycle's LTO work, and allows the arm64 kernels to be built with Clang's Control Flow Integrity feature. This feature has happily lived in Android kernels for almost 3 years[1], so I'm excited to have it ready for upstream. The wide diffstat is mainly due to the treewide fixing of mismatched list_sort prototypes. Other things in core kernel are to address various CFI corner cases. The largest code portion is the CFI runtime implementation itself (which will be shared by all architectures implementing support for CFI). The arm64 pieces are Acked by arm64 maintainers rather than coming through the arm64 tree since carrying this tree over there was going to be awkward. CFI support for x86 is still under development, but is pretty close. There are a handful of corner cases on x86 that need some improvements to Clang and objtool, but otherwise works well. Summary: - Clean up list_sort prototypes (Sami Tolvanen) - Introduce CONFIG_CFI_CLANG for arm64 (Sami Tolvanen)" * tag 'cfi-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: arm64: allow CONFIG_CFI_CLANG to be selected KVM: arm64: Disable CFI for nVHE arm64: ftrace: use function_nocfi for ftrace_call arm64: add __nocfi to __apply_alternatives arm64: add __nocfi to functions that jump to a physical address arm64: use function_nocfi with __pa_symbol arm64: implement function_nocfi psci: use function_nocfi for cpu_resume lkdtm: use function_nocfi treewide: Change list_sort to use const pointers bpf: disable CFI in dispatcher functions kallsyms: strip ThinLTO hashes from static functions kthread: use WARN_ON_FUNCTION_MISMATCH workqueue: use WARN_ON_FUNCTION_MISMATCH module: ensure __cfi_check alignment mm: add generic function_nocfi macro cfi: add __cficanonical add support for Clang CFI
Showing the changes to kernel/workqueue.c (1 of 75 files). Show all
Unified · Split
| @@ -1630,7 +1630,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, · 1629 unmodified lines | |||
| 1630 | struct work_struct *work = &dwork->work; | 1630 | struct work_struct *work = &dwork->work; |
| 1631 | 1631 | ||
| 1632 | WARN_ON_ONCE(!wq); | 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 | WARN_ON_ONCE(timer_pending(timer)); | 1634 | WARN_ON_ONCE(timer_pending(timer)); |
| 1635 | WARN_ON_ONCE(!list_empty(&work->entry)); | 1635 | WARN_ON_ONCE(!list_empty(&work->entry)); |
| 1636 | 1636 | ||