Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Sun, 14 Jan 2018 16:01:33 +0000 (11:01 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 14 Jan 2018 16:01:33 +0000 (11:01 -0500)
commit8155aedf512edd3f88ef19f7cacf476ace7d1322
tree3113dc2556227d089f65dcae87833583a80ab4f9
parent5dd966c680b616911a66d4576a9ed53aaf5f89ea
parentbbeb6e4323dad9b5e0ee9f60c223dd532e2403b1
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2018-01-13

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Follow-up fix to the recent BPF out-of-bounds speculation
   fix that prevents max_entries overflows and an undefined
   behavior on 32 bit archs on index_mask calculation, from
   Daniel.

2) Reject unsupported BPF_ARSH opcode in 32 bit ALU mode that
   was otherwise throwing an unknown opcode warning in the
   interpreter, from Daniel.

3) Typo fix in one of the user facing verbose() messages that
   was added during the BPF out-of-bounds speculation fix,
   from Colin.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>