Merge branch ' bpf fix for unconnect af_unix socket'

Browse source

John Fastabend says:

====================
Eric reported a syzbot splat from a null ptr deref from recent fix to
resolve a use-after-free with af-unix stream sockets and BPF sockmap
usage.

The issue is I missed is we allow unconnected af_unix STREAM sockets to
be added to the sockmap. Fix this by blocking unconnected sockets.

v2: change sk_is_unix to sk_is_stream_unix (Eric) and remove duplicate
    ASSERTS in selftests the xsocket helper already marks FAIL (Jakub)
====================

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

...

This commit is contained in:

Martin KaFai Lau 2023-12-13 16:21:53 -08:00

parent e307b5a845 50d96f05af

commit 2f2fee2bf7

3 changed files with 41 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

include/net/sock.h

View file

2

net/core/sock_map.c

View file

34

tools/testing/selftests/bpf/prog_tests/sockmap_basic.c

View file