All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alexei Starovoitov" <alexei.starovoitov@gmail.com>
To: "Shihuang Liu" <shlomojune6@gmail.com>, <netdev@vger.kernel.org>
Cc: <bpf@vger.kernel.org>, <edumazet@kernel.org>, <kuniyu@google.com>,
	<pabeni@redhat.com>, <willemb@google.com>, <davem@davemloft.net>,
	<kuba@kernel.org>, <horms@kernel.org>
Subject: Re: [PATCH v2] net: sock_reuseport: check program type on the migration path
Date: Thu, 19 Nov 2026 01:16:30 +0000	[thread overview]
Message-ID: <DMYSGWL8247Y.DQAGO9I6EPK3@gmail.com> (raw)
In-Reply-To: <20261118153541.172499-1-shlomojune6@gmail.com>

On Wed Nov 18, 2026 at 3:35 PM UTC, Shihuang Liu wrote:
> A BPF_PROG_TYPE_SOCKET_FILTER program can be loaded with
> expected_attach_type set to BPF_SK_REUSEPORT_SELECT_OR_MIGRATE and
> attached to a SO_REUSEPORT TCP group.  Closing a listener that still
> has queued children then runs it with a struct sk_reuseport_kern
> context even though it was verified against struct sk_buff, which
> KASAN reports as a stack-out-of-bounds in ___bpf_prog_run().
> Reaching this without CAP_BPF requires
> kernel.unprivileged_bpf_disabled=0; with
> CONFIG_BPF_UNPRIV_DEFAULT_OFF=y, the Kconfig default, the sysctl
> starts at 2.
>
> reuseport_migrate_sock() decides from prog->expected_attach_type
> alone, a field user space sets that does not identify the program
> type.  Require BPF_PROG_TYPE_SK_REUSEPORT there and in
> reuseport_stop_listen_sock(); socket filters still work as
> selectors, so the selection path is unchanged.
>
> Fixes: d5e4ddaeb6ab ("bpf: Support socket migration by eBPF.")
> Signed-off-by: Shihuang Liu <shlomojune6@gmail.com>
> ---
> Changes in v2:
> - Fix the author identity in From: and Signed-off-by:.
> - Mention the kernel.unprivileged_bpf_disabled dependency.
>
> v1: https://lore.kernel.org/all/20261115152408.48205-1-shlomojune6@gmail.com/
>
>  net/core/sock_reuseport.c | 16 ++++++++++++++--
>  1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/sock_reuseport.c b/net/core/sock_reuseport.c
> index fccbdd0430b059..9ab76697a794fc 100644
> --- a/net/core/sock_reuseport.c
> +++ b/net/core/sock_reuseport.c
> @@ -460,6 +460,18 @@ void reuseport_detach_sock(struct sock *sk)
>  }
>  EXPORT_SYMBOL(reuseport_detach_sock);
>  
> +/*
> + * Only a BPF_PROG_TYPE_SK_REUSEPORT program is verified against
> + * struct sk_reuseport_kern, which is the context bpf_run_sk_reuseport()
> + * passes to it.  expected_attach_type is set by user space and does not
> + * identify the program type.
> + */
> +static bool reuseport_is_migration_prog(const struct bpf_prog *prog)
> +{
> +	return prog && prog->type == BPF_PROG_TYPE_SK_REUSEPORT &&
> +	       prog->expected_attach_type == BPF_SK_REUSEPORT_SELECT_OR_MIGRATE;
> +}
> +
>  void reuseport_stop_listen_sock(struct sock *sk)
>  {
>  	if (sk->sk_protocol == IPPROTO_TCP) {
> @@ -474,7 +486,7 @@ void reuseport_stop_listen_sock(struct sock *sk)
>  						 lockdep_is_held(&reuseport_lock));
>  
>  		if (READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_migrate_req) ||
> -		    (prog && prog->expected_attach_type == BPF_SK_REUSEPORT_SELECT_OR_MIGRATE)) {
> +		    reuseport_is_migration_prog(prog)) {
>  			/* Migration capable, move sk from the listening section
>  			 * to the closed section.
>  			 */
> @@ -644,7 +656,7 @@ struct sock *reuseport_migrate_sock(struct sock *sk,
>  
>  	hash = migrating_sk->sk_hash;
>  	prog = rcu_dereference(reuse->prog);
> -	if (!prog || prog->expected_attach_type != BPF_SK_REUSEPORT_SELECT_OR_MIGRATE) {
> +	if (!reuseport_is_migration_prog(prog)) {

Looks fine.
Which tree should it go to?

netdev folks, opinion?
I'm fine whichever way.


  parent reply	other threads:[~2026-11-19  1:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 15:35 [PATCH v2] net: sock_reuseport: check program type on the migration path Shihuang Liu
2026-11-18 15:38 ` netdev-bot+sinfo
2026-11-19  1:16 ` Alexei Starovoitov [this message]
2026-11-19  1:54   ` Jakub Kicinski
2026-11-19  6:25 ` Kuniyuki Iwashima

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=DMYSGWL8247Y.DQAGO9I6EPK3@gmail.com \
    --to=alexei.starovoitov@gmail.com \
    --cc=bpf@vger.kernel.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@kernel.org \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=kuniyu@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=shlomojune6@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.