android_kernel_msm-6.1_noth.../include
Jason A. Donenfeld ff07ceec79 UPSTREAM: lib/crypto: blake2s: avoid indirect calls to compression function for Clang CFI
blake2s_compress_generic is weakly aliased by blake2s_compress. The
current harness for function selection uses a function pointer, which is
ordinarily inlined and resolved at compile time. But when Clang's CFI is
enabled, CFI still triggers when making an indirect call via a weak
symbol. This seems like a bug in Clang's CFI, as though it's bucketing
weak symbols and strong symbols differently. It also only seems to
trigger when "full LTO" mode is used, rather than "thin LTO".

[    0.000000][    T0] Kernel panic - not syncing: CFI failure (target: blake2s_compress_generic+0x0/0x1444)
[    0.000000][    T0] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.16.0-mainline-06981-g076c855b846e #1
[    0.000000][    T0] Hardware name: MT6873 (DT)
[    0.000000][    T0] Call trace:
[    0.000000][    T0]  dump_backtrace+0xfc/0x1dc
[    0.000000][    T0]  dump_stack_lvl+0xa8/0x11c
[    0.000000][    T0]  panic+0x194/0x464
[    0.000000][    T0]  __cfi_check_fail+0x54/0x58
[    0.000000][    T0]  __cfi_slowpath_diag+0x354/0x4b0
[    0.000000][    T0]  blake2s_update+0x14c/0x178
[    0.000000][    T0]  _extract_entropy+0xf4/0x29c
[    0.000000][    T0]  crng_initialize_primary+0x24/0x94
[    0.000000][    T0]  rand_initialize+0x2c/0x6c
[    0.000000][    T0]  start_kernel+0x2f8/0x65c
[    0.000000][    T0]  __primary_switched+0xc4/0x7be4
[    0.000000][    T0] Rebooting in 5 seconds..

Nonetheless, the function pointer method isn't so terrific anyway, so
this patch replaces it with a simple boolean, which also gets inlined
away. This successfully works around the Clang bug.

In general, I'm not too keen on all of the indirection involved here; it
clearly does more harm than good. Hopefully the whole thing can get
cleaned up down the road when lib/crypto is overhauled more
comprehensively. But for now, we go with a simple bandaid.

Link: https://lore.kernel.org/all/20220124192849.14755-1-Jason@zx2c4.com/
Bug: 218328931
Fixes: 6048fdcc5f ("lib/crypto: blake2s: include as built-in")
Link: https://github.com/ClangBuiltLinux/linux/issues/1567
Reported-by: Miles Chen <miles.chen@mediatek.com>
Tested-by: Miles Chen <miles.chen@mediatek.com>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Acked-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
(cherry picked from commit d2a02e3c8b)
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I797c6d79b120041aeb98ae68060d8cc4bd165c1a
2022-02-07 10:44:19 -08:00
..
acpi USB/Thunderbolt changes for 5.17-rc1 2022-01-12 11:27:57 -08:00
asm-generic Peter Zijlstra says: 2022-01-11 17:24:45 -08:00
clocksource
crypto UPSTREAM: lib/crypto: blake2s: avoid indirect calls to compression function for Clang CFI 2022-02-07 10:44:19 -08:00
drm Merge 8d0749b4f8 ("Merge tag 'drm-next-2022-01-07' of git://anongit.freedesktop.org/drm/drm") into android-mainline 2022-01-14 10:15:34 +01:00
dt-bindings Char/Misc and other driver changes for 5.17-rc1 2022-01-14 16:02:28 +01:00
keys keys: X.509 public key issuer lookup without AKID 2022-01-09 00:18:42 +02:00
kunit
kvm
linux ANDROID: Revert "perf/core: Use static_call to optimize perf_guest_info_callbacks" 2022-02-03 10:04:29 -08:00
math-emu
media media: dmxdev: drop unneeded <linux/kernel.h> inclusion from other headers 2021-12-14 16:19:04 +01:00
memory
misc
net Merge 8efd0d9c31 ("Merge tag '5.17-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline 2022-01-14 10:51:39 +01:00
pcmcia
ras
rdma RDMA/core: Calculate UDP source port based on flow label or lqpn/rqpn 2022-01-07 19:34:01 -04:00
scsi SCSI misc on 20220113 2022-01-14 14:37:34 +01:00
soc Networking changes for 5.17. 2022-01-10 19:06:09 -08:00
sound Merge a33f5c380c ("Merge tag 'xfs-5.17-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux") into android-mainline 2022-02-01 14:33:23 +01:00
target
trace Merge 13eaa5bda0 ("Merge tag 'iommu-updates-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu") into android-mainline 2022-02-01 12:00:10 +01:00
uapi Merge a33f5c380c ("Merge tag 'xfs-5.17-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux") into android-mainline 2022-02-01 14:33:23 +01:00
vdso
video
xen xen: branch for v5.17-rc1 2022-01-12 16:42:00 -08:00
OWNERS