From: David S. Miller <davem@davemloft.net>
Date: Fri, 16 Apr 2021 22:48:08 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b02265429681c9c827c45978a61a9f00be5ea9aa;p=uclinux-h8%2Flinux.git

Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2021-04-17

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

We've added 10 non-merge commits during the last 9 day(s) which contain
a total of 8 files changed, 175 insertions(+), 111 deletions(-).

The main changes are:

1) Fix a potential NULL pointer dereference in libbpf's xsk
   umem handling, from Ciara Loftus.

2) Mitigate a speculative oob read of up to map value size by
   tightening the masking window, from Daniel Borkmann.
====================

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

b02265429681c9c827c45978a61a9f00be5ea9aa