]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'bpf-sockmap-fix-af_unix-null-ptr-deref-in-proto-update'
authorMartin KaFai Lau <martin.lau@kernel.org>
Wed, 15 Apr 2026 20:15:25 +0000 (13:15 -0700)
committerMartin KaFai Lau <martin.lau@kernel.org>
Thu, 16 Apr 2026 00:23:18 +0000 (17:23 -0700)
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>

Trivial merge