From 78a7ad0d6dacbb2cb39e13e146f4f64d43593800 Mon Sep 17 00:00:00 2001 From: Michal Luczaj Date: Fri, 22 Aug 2025 11:40:56 +0800 Subject: [PATCH] net: Fix TOCTOU issue in sk_is_readable() stable inclusion from stable-v6.6.94 commit ff55c85a923e043d59d26b20a673a1b4a219c310 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICJTB0 CVE: CVE-2025-38112 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ff55c85a923e043d59d26b20a673a1b4a219c310 -------------------------------- [ Upstream commit 2660a544fdc0940bba15f70508a46cf9a6491230 ] sk->sk_prot->sock_is_readable is a valid function pointer when sk resides in a sockmap. After the last sk_psock_put() (which usually happens when socket is removed from sockmap), sk->sk_prot gets restored and sk->sk_prot->sock_is_readable becomes NULL. This makes sk_is_readable() racy, if the value of sk->sk_prot is reloaded after the initial check. Which in turn may lead to a null pointer dereference. Ensure the function pointer does not turn NULL after the check. Fixes: 8934ce2fd081 ("bpf: sockmap redirect ingress support") Suggested-by: Jakub Sitnicki Signed-off-by: Michal Luczaj Reviewed-by: Willem de Bruijn Link: https://patch.msgid.link/20250609-skisreadable-toctou-v1-1-d0dfb2d62c37@rbox.co Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin Signed-off-by: Wang Liang --- include/net/sock.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 81050e48698e..26456cb2bf8f 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -3081,8 +3081,11 @@ int sock_ioctl_inout(struct sock *sk, unsigned int cmd, int sk_ioctl(struct sock *sk, unsigned int cmd, void __user *arg); static inline bool sk_is_readable(struct sock *sk) { - if (sk->sk_prot->sock_is_readable) - return sk->sk_prot->sock_is_readable(sk); + const struct proto *prot = READ_ONCE(sk->sk_prot); + + if (prot->sock_is_readable) + return prot->sock_is_readable(sk); + return false; } #endif /* _SOCK_H */ -- Gitee