bpf: Replace "want address" users of BPF_CAST_CALL with BPF_CALL_IMM
authorKees Cook <keescook@chromium.org>
Tue, 28 Sep 2021 23:09:45 +0000 (16:09 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Tue, 28 Sep 2021 23:27:18 +0000 (16:27 -0700)
commit3d717fad5081b8e3bda76d86907fad95398cbde8
tree83cb8783224851a17ade5775f15f873f2617586a
parent09710d82c0a3469eadc32781721ac2336fdf915d
bpf: Replace "want address" users of BPF_CAST_CALL with BPF_CALL_IMM

In order to keep ahead of cases in the kernel where Control Flow
Integrity (CFI) may trip over function call casts, enabling
-Wcast-function-type is helpful. To that end, BPF_CAST_CALL causes
various warnings and is one of the last places in the kernel triggering
this warning.

Most places using BPF_CAST_CALL actually just want a void * to perform
math on. It's not actually performing a call, so just use a different
helper to get the void *, by way of the new BPF_CALL_IMM() helper, which
can clean up a common copy/paste idiom as well.

This change results in no object code difference.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://github.com/KSPP/linux/issues/20
Link: https://lore.kernel.org/lkml/CAEf4Bzb46=-J5Fxc3mMZ8JQPtK1uoE0q6+g6WPz53Cvx=CBEhw@mail.gmail.com
Link: https://lore.kernel.org/bpf/20210928230946.4062144-2-keescook@chromium.org
include/linux/filter.h
kernel/bpf/hashtab.c
kernel/bpf/verifier.c
lib/test_bpf.c