diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-25 17:35:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-25 17:35:03 -0700 |
| commit | 28ba934d28cf46c1ea92f6aff28e8d9ec52e194e (patch) | |
| tree | 821fd2b12068195842b6d95acf3c5eaac605fcd3 /kernel | |
| parent | 47d858d0bdcd47cc1c6c9eeca91b091dd9e55637 (diff) | |
| parent | cb8ffde5694ae5fffb456eae932aac442aa3a207 (diff) | |
| download | linux-28ba934d28cf46c1ea92f6aff28e8d9ec52e194e.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-07-25
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) fix segfault in libbpf, from Andrii.
2) fix gso_segs access, from Eric.
3) tls/sockmap fixes, from Jakub and John.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/verifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 5900cbb966b1..c84d83f86141 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -8616,8 +8616,8 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env) } if (is_narrower_load && size < target_size) { - u8 shift = (off & (size_default - 1)) * 8; - + u8 shift = bpf_ctx_narrow_load_shift(off, size, + size_default); if (ctx_field_size <= 4) { if (shift) insn_buf[cnt++] = BPF_ALU32_IMM(BPF_RSH, |