Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2021 22:26:07 +0000 (15:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2021 22:26:07 +0000 (15:26 -0700)
commita4f0377db1254373513b992ff31a351a7111f0fd
tree5164b11ead32a0e39620350b7f77112b82c18dcb
parent7ea6cd16f1599c1eac6018751eadbc5fc736b99a
parent973377ffe8148180b2651825b92ae91988141b05
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2021-06-15

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

We've added 5 non-merge commits during the last 11 day(s) which contain
a total of 10 files changed, 115 insertions(+), 16 deletions(-).

The main changes are:

1) Fix marking incorrect umem ring as done in libbpf's
   xsk_socket__create_shared() helper, from Kev Jackson.

2) Fix oob leakage under a spectre v1 type confusion
   attack, from Daniel Borkmann.
====================

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