From: Martin KaFai Lau <martin.lau@kernel.org>
Date: Wed, 15 Apr 2026 20:15:25 +0000 (-0700)
Subject: Merge branch 'bpf-sockmap-fix-af_unix-null-ptr-deref-in-proto-update'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a20446652956ed26be529b8788e76dfddf705717;p=thirdparty%2Fkernel%2Flinux.git

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

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>
---

a20446652956ed26be529b8788e76dfddf705717