diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-18 09:17:04 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-18 09:17:04 -0500 |
| commit | 7155f8f391576f133ed26c8d6bb8c7f03ceb404a (patch) | |
| tree | c1c219defbaaf8ac3569b4e2ebccd76bda627a31 /net/core | |
| parent | ad9294dbc227cbc8e173b3b963e7dd9af5314f77 (diff) | |
| parent | 6f16101e6a8b4324c36e58a29d9e0dbb287cdedb (diff) | |
| download | linux-7155f8f391576f133ed26c8d6bb8c7f03ceb404a.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-01-18
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix a divide by zero due to wrong if (src_reg == 0) check in
64-bit mode. Properly handle this in interpreter and mask it
also generically in verifier to guard against similar checks
in JITs, from Eric and Alexei.
2) Fix a bug in arm64 JIT when tail calls are involved and progs
have different stack sizes, from Daniel.
3) Reject stores into BPF context that are not expected BPF_STX |
BPF_MEM variant, from Daniel.
4) Mark dst reg as unknown on {s,u}bounds adjustments when the
src reg has derived bounds from dead branches, from Daniel.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index d339ef170df6..1c0eb436671f 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -458,6 +458,10 @@ do_pass: convert_bpf_extensions(fp, &insn)) break; + if (fp->code == (BPF_ALU | BPF_DIV | BPF_X) || + fp->code == (BPF_ALU | BPF_MOD | BPF_X)) + *insn++ = BPF_MOV32_REG(BPF_REG_X, BPF_REG_X); + *insn = BPF_RAW_INSN(fp->code, BPF_REG_A, BPF_REG_X, 0, fp->k); break; |