From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
To: Michal Luczaj <mhal@rbox.co>, Eric Dumazet <edumazet@google.com>,
Kuniyuki Iwashima <kuniyu@amazon.com>,
Paolo Abeni <pabeni@redhat.com>,
Willem de Bruijn <willemb@google.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Simon Horman <horms@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
John Fastabend <john.fastabend@gmail.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Jakub Sitnicki <jakub@cloudflare.com>,
Michal Luczaj <mhal@rbox.co>,
cong.wang@bytedance.com
Subject: Re: [PATCH net] net: Fix TOCTOU issue in sk_is_readable()
Date: Tue, 10 Jun 2025 09:44:32 -0400 [thread overview]
Message-ID: <684836c0591e3_3cd66f29487@willemb.c.googlers.com.notmuch> (raw)
In-Reply-To: <20250609-skisreadable-toctou-v1-1-d0dfb2d62c37@rbox.co>
Michal Luczaj wrote:
> 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.
e.g., through
psock_update_sk_prot
tcp_bpf_update_proto
sock_replace_proto
> 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.
This is similar to the existing READ_ONCE in sk_clone_lock introduced
in commit b8e202d1d1d0 ("net, sk_msg: Annotate lockless access to
sk_prot on clone")
>
> Fixes: 8934ce2fd081 ("bpf: sockmap redirect ingress support")
> Suggested-by: Jakub Sitnicki <jakub@cloudflare.com>
> Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Willem de Bruijn <willemb@google.com>
> ---
> 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 92e7c1aae3ccafe3a806dcee07ec77a469c0f43d..4c37015b7cf71e4902bdf411cfa57528a5d16ab3 100644
> --- a/include/net/sock.h
> +++ b/include/net/sock.h
> @@ -3010,8 +3010,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 */
>
> ---
> base-commit: 82cbd06f327f3c2ccdee990bd356c9303ae168f9
> change-id: 20250525-skisreadable-toctou-382c42ffb685
>
> Best regards,
> --
> Michal Luczaj <mhal@rbox.co>
>
next prev parent reply other threads:[~2025-06-10 13:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-09 17:08 Michal Luczaj
2025-06-10 13:44 ` Willem de Bruijn [this message]
2025-06-10 23:39 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=684836c0591e3_3cd66f29487@willemb.c.googlers.com.notmuch \
--to=willemdebruijn.kernel@gmail.com \
--cc=cong.wang@bytedance.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhal@rbox.co \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®