diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-18 20:05:17 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-18 20:05:17 +0300 |
| commit | 6bd0c76bd70447aedfeafa9e1fcc249991d6c678 (patch) | |
| tree | 88fe7899e5e6e11166af4d17703c67180d313093 /net/ipv4 | |
| parent | 9905eed48e82dfe265e2b9e57f19f8e0d1b7d0d7 (diff) | |
| parent | 18b1ab7aa76bde181bdb1ab19a87fa9523c32f21 (diff) | |
Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2022-03-18
We've added 2 non-merge commits during the last 18 day(s) which contain
a total of 2 files changed, 50 insertions(+), 20 deletions(-).
The main changes are:
1) Fix a race in XSK socket teardown code that can lead to a NULL pointer
dereference, from Magnus.
2) Small MAINTAINERS doc update to remove Lorenz from sockmap, from Lorenz.
* https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
xsk: Fix race at socket teardown
bpf: Remove Lorenz Bauer from L7 BPF maintainers
====================
Link: https://lore.kernel.org/r/20220318152418.28638-1-daniel@iogearbox.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions