bpf: Avoid function casting when calculating immediate
PATCH 1/1 bpf: Avoid function casting when calculating immediate
In an effort to enable -Wcast-function-type in the top-level Makefile to support Control Flow Integrity builds, rework the BPF instruction immediate calculation macros to avoid mismatched function pointers. Since these calculations are only ever between function address (these are not function calls, just address calculations), they can be cast to u64 instead, where the result will be assigned to the s32 insn->imm.
--- include/linux/filter.h | 6 +++--- kernel/bpf/hashtab.c | 6 +++--- kernel/bpf/verifier.c | 21 +++++++-------------- 3 files changed, 13 insertions(+), 20 deletions(-)
include/linux/filter.h +3 -3
@@ -340,8 +340,8 @@ static inline bool insn_is_zext(const struct bpf_insn *insn)/* Function call */ -#define BPF_CAST_CALL (x) \ - ((u64 (*)(u64, u64, u64, u64, u64))(x)) +#define BPF_FUNC_IMM (FUNC ) \ + ((u64)(FUNC) - (u64)__bpf_call_base)#define BPF_EMIT_CALL (FUNC ) \ ((struct bpf_insn) { \
@@ -349,7 +349,7 @@ static inline bool insn_is_zext(const struct bpf_insn *insn) .dst_reg = 0, \ .src_reg = 0, \ .off = 0, \ - .imm = ((FUNC) - __bpf_call_base) }) + .imm = BPF_FUNC_IMM(FUNC) })/* Raw code statement block */
kernel/bpf/hashtab.c +3 -3
@@ -517,7 +517,7 @@ static u32 htab_map_gen_lookup(struct bpf_map *map, struct bpf_insn *insn_buf)BUILD_BUG_ON (!__same_type (&__htab_map_lookup_elem, (void *(*)(struct bpf_map *map,void *key))NULL )); - *insn++ =BPF_EMIT_CALL (BPF_CAST_CALL (__htab_map_lookup_elem)); + *insn++ =BPF_EMIT_CALL (__htab_map_lookup_elem); *insn++ =BPF_JMP_IMM (BPF_JEQ , ret,0 ,1 ); *insn++ = BPF_ALU64_IMM(BPF_ADD, ret, offsetof(struct htab_elem, key) +
@@ -558,7 +558,7 @@ static u32 htab_lru_map_gen_lookup(struct bpf_map *map,BUILD_BUG_ON (!__same_type (&__htab_map_lookup_elem, (void *(*)(struct bpf_map *map,void *key))NULL )); - *insn++ =BPF_EMIT_CALL (BPF_CAST_CALL (__htab_map_lookup_elem)); + *insn++ =BPF_EMIT_CALL (__htab_map_lookup_elem); *insn++ =BPF_JMP_IMM (BPF_JEQ , ret,0 ,4 ); *insn++ = BPF_LDX_MEM(BPF_B, ref_reg, ret, offsetof(struct htab_elem, lru_node) +
@@ -1749,7 +1749,7 @@ static u32 htab_of_map_gen_lookup(struct bpf_map *map,BUILD_BUG_ON (!__same_type (&__htab_map_lookup_elem, (void *(*)(struct bpf_map *map,void *key))NULL )); - *insn++ =BPF_EMIT_CALL (BPF_CAST_CALL (__htab_map_lookup_elem)); + *insn++ =BPF_EMIT_CALL (__htab_map_lookup_elem); *insn++ =BPF_JMP_IMM (BPF_JEQ , ret,0 ,2 ); *insn++ = BPF_ALU64_IMM(BPF_ADD, ret, offsetof(struct htab_elem, key) +
kernel/bpf/verifier.c +7 -14
@@ -9054,8 +9054,7 @@ static int jit_subprogs(struct bpf_verifier_env *env) insn->src_reg != BPF_PSEUDO_CALL)continue ; subprog = insn->off; - insn->imm =BPF_CAST_CALL (func[subprog]->bpf_func) - - __bpf_call_base; + insn->imm =BPF_FUNC_IMM (func[subprog]->bpf_func); }/* we use the aux data to keep a list of the start addresses
@@ -9429,28 +9428,22 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)switch (insn->imm) {case BPF_FUNC_map_lookup_elem: - insn->imm =BPF_CAST_CALL (ops->map_lookup_elem) - - __bpf_call_base; + insn->imm =BPF_FUNC_IMM (ops->map_lookup_elem);continue ;case BPF_FUNC_map_update_elem: - insn->imm =BPF_CAST_CALL (ops->map_update_elem) - - __bpf_call_base; + insn->imm =BPF_FUNC_IMM (ops->map_update_elem);continue ;case BPF_FUNC_map_delete_elem: - insn->imm =BPF_CAST_CALL (ops->map_delete_elem) - - __bpf_call_base; + insn->imm =BPF_FUNC_IMM (ops->map_delete_elem);continue ;case BPF_FUNC_map_push_elem: - insn->imm =BPF_CAST_CALL (ops->map_push_elem) - - __bpf_call_base; + insn->imm =BPF_FUNC_IMM (ops->map_push_elem);continue ;case BPF_FUNC_map_pop_elem: - insn->imm =BPF_CAST_CALL (ops->map_pop_elem) - - __bpf_call_base; + insn->imm =BPF_FUNC_IMM (ops->map_pop_elem);continue ;case BPF_FUNC_map_peek_elem: - insn->imm =BPF_CAST_CALL (ops->map_peek_elem) - - __bpf_call_base; + insn->imm =BPF_FUNC_IMM (ops->map_peek_elem);continue ; }
Signature · 5 lines
2.20.1 -- Kees Cook
Daniel Borkmann
maintainerQuoted 19 lines · Kees Cook
In an effort to enable -Wcast-function-type in the top-level
Makefileto support Control Flow Integrity builds, rework the BPF instruction immediate calculation macros to avoid mismatched function pointers. Since these calculations are only ever between function address (these are not function calls, just address calculations), they can be cast to u64 instead, where the result will be assigned to the s32insn->imm.Signed-off-by Kees Cook <[email protected]>--- include/linux/filter.h | 6 +++--- kernel/bpf/hashtab.c | 6 +++--- kernel/bpf/verifier.c | 21 +++++++-------------- 3 files changed, 13 insertions(+), 20 deletions(-)include/linux/filter.h +0
-0
include/linux/filter.h static inline bool insn_is_zext(const struct bpf_insn *insn) · line 344
Quoted 7 lines
include/linux/filter.h +2
-2@@ -340,8 +340,8 @@ static inline bool insn_is_zext(const struct bpf_insn *insn)/* Function call */ -#define BPF_CAST_CALL (x) \ - ((u64 (*)(u64, u64, u64, u64, u64))(x)) +#define BPF_FUNC_IMM (FUNC ) \ + ((u64)(FUNC) - (u64)__bpf_call_base)
Looks good to me in general. My only concern is compilation on 32bit archs: I think the cast needs to be of '(u64)(unsigned long)' to avoid introducing new warnings a la 'cast from pointer to integer of different size'.
Thanks,
Daniel
Quoted 15 lines · Daniel Borkmann
Quoted 14 lines · Kees Cook
In an effort to enable -Wcast-function-type in the top-level
Makefileto support Control Flow Integrity builds, rework the BPF instruction immediate calculation macros to avoid mismatched function pointers. Since these calculations are only ever between function address (these are not function calls, just address calculations), they can be cast to u64 instead, where the result will be assigned to the s32insn->imm.Signed-off-by Kees Cook <[email protected]>--- include/linux/filter.h | 6 +++--- kernel/bpf/hashtab.c | 6 +++--- kernel/bpf/verifier.c | 21 +++++++-------------- 3 files changed, 13 insertions(+), 20 deletions(-)
Quoted 14 lines
include/linux/filter.h static inline bool insn_is_zext(const struct bpf_insn *insn) · line 342
Quoted 10 lines
include/linux/filter.h +2
-2@@ -340,8 +340,8 @@ static inline bool insn_is_zext(const struct bpf_insn *insn)/* Function call */ -#define BPF_CAST_CALL (x) \ - ((u64 (*)(u64, u64, u64, u64, u64))(x)) +#define BPF_FUNC_IMM (FUNC ) \ + ((u64)(FUNC) - (u64)__bpf_call_base)Looks good to me in general. My only concern is compilation on 32bit archs: I think the cast needs to be of '(u64)(unsigned long)' to avoid introducing new warnings a la 'cast from pointer to integer of different size'.
Oh, good point. I'll double-check the 32-bit builds. (I also have another related change that I found several days later.) I'll get this adjusted/tested and resend the patch.
Thanks!
-Kees
Signature · 1 line
Kees Cook