diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-26 00:30:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-26 00:30:46 +0100 |
| commit | 241949e488f38a192f2359dbb21d80e08173eb60 (patch) | |
| tree | 5a8975683f2ccadfbba7ebeb55db482e605581bb /kernel/bpf/verifier.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| parent | bpf: Avoid old-style declaration warnings (diff) | |
| download | linux-241949e488f38a192f2359dbb21d80e08173eb60.tar.xz linux-241949e488f38a192f2359dbb21d80e08173eb60.zip | |
Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2021-03-24
The following pull-request contains BPF updates for your *net-next* tree.
We've added 37 non-merge commits during the last 15 day(s) which contain
a total of 65 files changed, 3200 insertions(+), 738 deletions(-).
The main changes are:
1) Static linking of multiple BPF ELF files, from Andrii.
2) Move drop error path to devmap for XDP_REDIRECT, from Lorenzo.
3) Spelling fixes from various folks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/verifier.c')
| -rw-r--r-- | kernel/bpf/verifier.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 999bf36ffeb1..210169c25ead 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -11912,7 +11912,6 @@ static int do_misc_fixups(struct bpf_verifier_env *env) insn->code == (BPF_ALU64 | BPF_SUB | BPF_X)) { const u8 code_add = BPF_ALU64 | BPF_ADD | BPF_X; const u8 code_sub = BPF_ALU64 | BPF_SUB | BPF_X; - struct bpf_insn insn_buf[16]; struct bpf_insn *patch = &insn_buf[0]; bool issrc, isneg; u32 off_reg; |