diff options
author | David S. Miller | 2021-06-15 15:26:07 -0700 |
---|---|---|
committer | David S. Miller | 2021-06-15 15:26:07 -0700 |
commit | a4f0377db1254373513b992ff31a351a7111f0fd (patch) | |
tree | 5164b11ead32a0e39620350b7f77112b82c18dcb /net/can | |
parent | 7ea6cd16f1599c1eac6018751eadbc5fc736b99a (diff) | |
parent | 973377ffe8148180b2651825b92ae91988141b05 (diff) |
Merge git://git.kernel.org/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>
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions