diff options
| author | David S. Miller <davem@davemloft.net> | 2021-07-29 01:53:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-29 01:53:32 +0200 |
| commit | fc16a5322ee6c30ea848818722eee5d352f8d127 (patch) | |
| tree | 2f61fb372bf7a1c337fd0c1bd51a4096567e5d0c /arch/arm | |
| parent | sis900: Fix missing pci_disable_device() in probe and remove (diff) | |
| parent | bpf: Fix leakage due to insufficient speculative store bypass mitigation (diff) | |
| download | linux-fc16a5322ee6c30ea848818722eee5d352f8d127.tar.xz linux-fc16a5322ee6c30ea848818722eee5d352f8d127.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2021-07-29
The following pull-request contains BPF updates for your *net* tree.
We've added 9 non-merge commits during the last 14 day(s) which contain
a total of 20 files changed, 446 insertions(+), 138 deletions(-).
The main changes are:
1) Fix UBSAN out-of-bounds splat for showing XDP link fdinfo, from Lorenz Bauer.
2) Fix insufficient Spectre v4 mitigation in BPF runtime, from Daniel Borkmann,
Piotr Krysiuk and Benedict Schlueter.
3) Batch of fixes for BPF sockmap found under stress testing, from John Fastabend.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/net/bpf_jit_32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 897634d0a67c..a951276f0547 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -1602,6 +1602,9 @@ exit: rn = arm_bpf_get_reg32(src_lo, tmp2[1], ctx); emit_ldx_r(dst, rn, off, ctx, BPF_SIZE(code)); break; + /* speculation barrier */ + case BPF_ST | BPF_NOSPEC: + break; /* ST: *(size *)(dst + off) = imm */ case BPF_ST | BPF_MEM | BPF_W: case BPF_ST | BPF_MEM | BPF_H: |