Merge branch 'bpf-sockmap-fix-af_unix-null-ptr-deref-in-proto-update'

Browse source

Michal Luczaj says:

====================
bpf, sockmap: Fix af_unix null-ptr-deref in proto update

Updating sockmap/sockhash using a unix sock races unix_stream_connect():
when sock_map_sk_state_allowed() passes (sk_state == TCP_ESTABLISHED),
unix_peer(sk) in unix_stream_bpf_update_proto() may still return NULL.
====================

Link: https://patch.msgid.link/20260414-unix-proto-update-null-ptr-deref-v4-0-2af6fe97918e@rbox.co
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

...

This commit is contained in:

Martin KaFai Lau 2026-04-15 13:15:25 -07:00

parent 9d8e92e15f 64c2f93fc3

commit a204466529

4 changed files with 20 additions and 6 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

4

net/core/sock_map.c

View file

9

net/unix/af_unix.c

View file

3

net/unix/unix_bpf.c

View file

10

tools/testing/selftests/bpf/progs/bpf_iter_unix.c

View file