diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2019-01-05 21:32:39 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-01-05 21:32:39 -0800 |
| commit | 97274b6126193cca2b820579f5d758589a2badc2 (patch) | |
| tree | 576851fb11b2246f784da4ef3716fd441037ceaf /include | |
| parent | 466f89e9ec8c6868131c2d2ba9cd5f536879c42a (diff) | |
| parent | 1cbbcfbbd56efd994d643428c69467fe3c8ab672 (diff) | |
Merge branch 'reject-ptr-scalar-mix'
Daniel Borkmann says:
====================
Follow-up fix to 979d63d50c0c ("bpf: prevent out of bounds speculation
on pointer arithmetic") in order to reject a corner case for sanitation
when ptr / scalars are mixed in the same alu op.
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bpf_verifier.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index 27b74947cd2b..573cca00a0e6 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -172,6 +172,7 @@ struct bpf_verifier_state_list { #define BPF_ALU_SANITIZE_SRC 1U #define BPF_ALU_SANITIZE_DST 2U #define BPF_ALU_NEG_VALUE (1U << 2) +#define BPF_ALU_NON_POINTER (1U << 3) #define BPF_ALU_SANITIZE (BPF_ALU_SANITIZE_SRC | \ BPF_ALU_SANITIZE_DST) |