]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
cfi: Fix __cfi_slowpath_diag RCU usage with cpuidle
authorSami Tolvanen <samitolvanen@google.com>
Tue, 31 May 2022 17:59:10 +0000 (10:59 -0700)
committerKees Cook <keescook@chromium.org>
Mon, 13 Jun 2022 16:18:46 +0000 (09:18 -0700)
commit57cd6d157eb479f0a8e820fd36b7240845c8a937
treee19640e7508fe88f5ce7011fefa58a5d91025b6b
parentb13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3
cfi: Fix __cfi_slowpath_diag RCU usage with cpuidle

RCU_NONIDLE usage during __cfi_slowpath_diag can result in an invalid
RCU state in the cpuidle code path:

  WARNING: CPU: 1 PID: 0 at kernel/rcu/tree.c:613 rcu_eqs_enter+0xe4/0x138
  ...
  Call trace:
    rcu_eqs_enter+0xe4/0x138
    rcu_idle_enter+0xa8/0x100
    cpuidle_enter_state+0x154/0x3a8
    cpuidle_enter+0x3c/0x58
    do_idle.llvm.6590768638138871020+0x1f4/0x2ec
    cpu_startup_entry+0x28/0x2c
    secondary_start_kernel+0x1b8/0x220
    __secondary_switched+0x94/0x98

Instead, call rcu_irq_enter/exit to wake up RCU only when needed and
disable interrupts for the entire CFI shadow/module check when we do.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Link: https://lore.kernel.org/r/20220531175910.890307-1-samitolvanen@google.com
Fixes: cf68fffb66d6 ("add support for Clang CFI")
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
kernel/cfi.c