diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-26 19:46:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-26 19:46:15 -0400 |
| commit | 5b79c2af667c0e2684f2a6dbf6439074b78f490c (patch) | |
| tree | efda2b94317c914fef0bfb25fe5ada9e253d5415 /include/linux/bpf_verifier.h | |
| parent | e52cde71709348c0d67bf0f213b438fa4d6cf9a9 (diff) | |
| parent | bc2dbc5420e82560e650f8531ceca597441ca171 (diff) | |
| download | linux-0-day-5b79c2af667c0e2684f2a6dbf6439074b78f490c.tar.gz linux-0-day-5b79c2af667c0e2684f2a6dbf6439074b78f490c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of easy overlapping changes in the confict
resolutions here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/bpf_verifier.h')
| -rw-r--r-- | include/linux/bpf_verifier.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index c286813deaebe..38b04f559ad37 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -142,10 +142,11 @@ struct bpf_verifier_state_list { struct bpf_insn_aux_data { union { enum bpf_reg_type ptr_type; /* pointer type for load/store insns */ - struct bpf_map *map_ptr; /* pointer for call insn into lookup_elem */ + unsigned long map_state; /* pointer/poison value for maps */ s32 call_imm; /* saved imm field of call insn */ }; int ctx_field_size; /* the ctx field size for load insn, maybe 0 */ + int sanitize_stack_off; /* stack slot to be cleared */ bool seen; /* this insn was processed by the verifier */ }; |