diff options
| author | David S. Miller <davem@davemloft.net> | 2021-05-03 18:40:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-03 18:40:17 -0700 |
| commit | 1682d8df20aa505f6ab12c76e934b26ede39c529 (patch) | |
| tree | c3534a6946f300d4fc0d565891d2806983fa9a5b /include | |
| parent | bd1af6b5fffd36c12997bd48d61d39dc5796fa7b (diff) | |
| parent | ac31565c21937eee9117e43c9cd34f557f6f1cb8 (diff) | |
| download | linux-stable-1682d8df20aa505f6ab12c76e934b26ede39c529.tar.gz linux-stable-1682d8df20aa505f6ab12c76e934b26ede39c529.tar.bz2 linux-stable-1682d8df20aa505f6ab12c76e934b26ede39c529.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2021-05-04
The following pull-request contains BPF updates for your *net* tree.
We've added 5 non-merge commits during the last 4 day(s) which contain
a total of 6 files changed, 52 insertions(+), 30 deletions(-).
The main changes are:
1) Fix libbpf overflow when processing BPF ring buffer in case of extreme
application behavior, from Brendan Jackman.
2) Fix potential data leakage of uninitialized BPF stack under speculative
execution, from Daniel Borkmann.
3) Fix off-by-one when validating xsk pool chunks, from Xuan Zhuo.
4) Fix snprintf BPF selftest with a pid filter to avoid racing its output
test buffer, from Florent Revest.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bpf_verifier.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index 6023a1367853..06841517ab1e 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -302,10 +302,11 @@ struct bpf_verifier_state_list { }; /* Possible states for alu_state member. */ -#define BPF_ALU_SANITIZE_SRC 1U -#define BPF_ALU_SANITIZE_DST 2U +#define BPF_ALU_SANITIZE_SRC (1U << 0) +#define BPF_ALU_SANITIZE_DST (1U << 1) #define BPF_ALU_NEG_VALUE (1U << 2) #define BPF_ALU_NON_POINTER (1U << 3) +#define BPF_ALU_IMMEDIATE (1U << 4) #define BPF_ALU_SANITIZE (BPF_ALU_SANITIZE_SRC | \ BPF_ALU_SANITIZE_DST) |