From: "Emil Tsalapatis" <emil@etsalapatis.com>
To: "Kuniyuki Iwashima" <kuniyu@google.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Andrii Nakryiko" <andrii@kernel.org>,
"Martin KaFai Lau" <martin.lau@linux.dev>,
"Eduard Zingerman" <eddyz87@gmail.com>,
"Kumar Kartikeya Dwivedi" <memxor@gmail.com>
Cc: "Yonghong Song" <yonghong.song@linux.dev>,
"John Fastabend" <john.fastabend@gmail.com>,
"Stanislav Fomichev" <sdf@fomichev.me>,
"Eric Dumazet" <edumazet@google.com>,
"Neal Cardwell" <ncardwell@google.com>,
"Willem de Bruijn" <willemb@google.com>,
"Tenzin Ukyab" <ukyab@berkeley.edu>,
"Clément Léger" <cleger@meta.com>,
"Kuniyuki Iwashima" <kuni1840@gmail.com>,
bpf@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH v2 bpf-next 1/8] bpf: tcp: Convert deny-list for bpf_{get,set}sockopt() to allow-list.
Date: Wed, 23 Sep 2026 22:04:58 +0000 [thread overview]
Message-ID: <DLN1BR3DH9EF.1SIZB3GN9XEVQ@etsalapatis.com> (raw)
In-Reply-To: <20260923213719.224838-2-kuniyu@google.com>
On Wed Sep 23, 2026 at 9:35 PM UTC, Kuniyuki Iwashima wrote:
> Currently, four bpf_tcp_ops callbacks are not allowed to call
> bpf_setsockopt() and bpf_getsockopt().
>
> However, the deny-list is fragile, and when a new callback is
> added, we might re-open a can of worms. [1][2]
>
> Let's convert it to allow-list.
>
> Note that it can be written as offsetof(,X) <= moff <= offsetof(,Y)
> but clang can optimise to similar code anyway.
Reviewed-by: Emil Tsalapatis <emil@etsalapatis.com>
Even if in the future we need to split the allowlist further it's better
to be verbose than have it break out from under us.
>
> Link: https://lore.kernel.org/r/20220929070407.965581-5-martin.lau@linux.dev/ #[0]
> Link: https://lore.kernel.org/bpf/20260421155804.135786-1-kafai.wan@linux.dev/ #[1]
> Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
> ---
> net/ipv4/bpf_tcp_ops.c | 39 ++++++++++++++++++++++++---------------
> 1 file changed, 24 insertions(+), 15 deletions(-)
>
> diff --git a/net/ipv4/bpf_tcp_ops.c b/net/ipv4/bpf_tcp_ops.c
> index 681fed642999..1ada3b781bf1 100644
> --- a/net/ipv4/bpf_tcp_ops.c
> +++ b/net/ipv4/bpf_tcp_ops.c
> @@ -210,6 +210,24 @@ const struct bpf_func_proto bpf_tcp_ops_get_retval_proto = {
> .ret_type = RET_INTEGER,
> };
>
> +static bool is_sockopt_supported(u32 moff)
> +{
> + switch (moff) {
> + case offsetof(struct bpf_tcp_ops, active_established):
> + case offsetof(struct bpf_tcp_ops, passive_established):
> + case offsetof(struct bpf_tcp_ops, rto):
> + case offsetof(struct bpf_tcp_ops, rtt):
> + case offsetof(struct bpf_tcp_ops, set_state):
> + case offsetof(struct bpf_tcp_ops, retrans):
> + case offsetof(struct bpf_tcp_ops, connect):
> + case offsetof(struct bpf_tcp_ops, listen):
> + case offsetof(struct bpf_tcp_ops, parse_hdr):
> + return true;
> + }
> +
> + return false;
> +}
> +
> static const struct bpf_func_proto *
> get_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
> {
> @@ -221,22 +239,13 @@ get_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
> case BPF_FUNC_sk_storage_delete:
> return &bpf_sk_storage_delete_proto;
> case BPF_FUNC_setsockopt:
> - /* The sk may be an unlocked listener (synack path) or NULL
> - * fullsock; disable for members that can run unlocked.
> - */
> - if (moff == offsetof(struct bpf_tcp_ops, rwnd_init) ||
> - moff == offsetof(struct bpf_tcp_ops, timeout_init) ||
> - moff == offsetof(struct bpf_tcp_ops, hdr_opt_len) ||
> - moff == offsetof(struct bpf_tcp_ops, write_hdr_opt))
> - return NULL;
> - return &bpf_sk_setsockopt_proto;
> + if (is_sockopt_supported(moff))
> + return &bpf_sk_setsockopt_proto;
> + return NULL;
> case BPF_FUNC_getsockopt:
> - if (moff == offsetof(struct bpf_tcp_ops, rwnd_init) ||
> - moff == offsetof(struct bpf_tcp_ops, timeout_init) ||
> - moff == offsetof(struct bpf_tcp_ops, hdr_opt_len) ||
> - moff == offsetof(struct bpf_tcp_ops, write_hdr_opt))
> - return NULL;
> - return &bpf_sk_getsockopt_proto;
> + if (is_sockopt_supported(moff))
> + return &bpf_sk_getsockopt_proto;
> + return NULL;
> case BPF_FUNC_get_retval:
> if (moff == offsetof(struct bpf_tcp_ops, timeout_init) ||
> moff == offsetof(struct bpf_tcp_ops, rwnd_init))
next prev parent reply other threads:[~2026-09-23 22:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-23 21:35 [PATCH v2 bpf-next 0/8] bpf: Add bpf_tcp_ops hooks for TCP AutoLOWAT Kuniyuki Iwashima
2026-09-23 21:35 ` [PATCH v2 bpf-next 1/8] bpf: tcp: Convert deny-list for bpf_{get,set}sockopt() to allow-list Kuniyuki Iwashima
2026-09-23 22:04 ` Emil Tsalapatis [this message]
2026-09-23 22:31 ` bot+bpf-ci
2026-09-24 15:53 ` Stanislav Fomichev
2026-09-23 21:35 ` [PATCH v2 bpf-next 2/8] selftest: bpf: Use BPF_SOCK_OPS_ALL_CB_FLAGS + 1 for bad_cb_test_rv Kuniyuki Iwashima
2026-09-23 22:11 ` Emil Tsalapatis
2026-09-23 21:35 ` [PATCH v2 bpf-next 3/8] bpf: tcp: Introduce bpf_tcp_ops.{enqueue,dequeue}_rcvq() Kuniyuki Iwashima
2026-09-23 22:42 ` Emil Tsalapatis
2026-09-25 0:04 ` Alexei Starovoitov
2026-09-25 0:39 ` Kuniyuki Iwashima
2026-09-25 1:41 ` Alexei Starovoitov
2026-09-25 17:33 ` Amery Hung
2026-09-27 0:18 ` Kuniyuki Iwashima
2026-09-30 19:56 ` Amery Hung
2026-09-30 21:03 ` Kuniyuki Iwashima
2026-09-23 21:35 ` [PATCH v2 bpf-next 4/8] bpf: tcp: Support bpf_sock_ops_cb_flags_set() for bpf_tcp_ops Kuniyuki Iwashima
2026-09-23 22:31 ` bot+bpf-ci
2026-09-23 21:35 ` [PATCH v2 bpf-next 5/8] tcp: Split out __tcp_set_rcvlowat() Kuniyuki Iwashima
2026-09-24 3:39 ` Emil Tsalapatis
2026-09-23 21:35 ` [PATCH v2 bpf-next 6/8] bpf: mptcp: Don't support BPF_SOCK_OPS_RCVQ_CB_FLAG Kuniyuki Iwashima
2026-09-24 3:48 ` Emil Tsalapatis
2026-09-24 4:10 ` Kuniyuki Iwashima
2026-09-23 21:35 ` [PATCH v2 bpf-next 7/8] bpf: tcp: Add kfunc to adjust sk->sk_rcvlowat Kuniyuki Iwashima
2026-09-24 0:30 ` Emil Tsalapatis
2026-09-23 21:35 ` [PATCH v2 bpf-next 8/8] selftest: bpf: Add test for bpf_tcp_ops.{enqueue,dequeue}_rcvq() 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=DLN1BR3DH9EF.1SIZB3GN9XEVQ@etsalapatis.com \
--to=emil@etsalapatis.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=cleger@meta.com \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=edumazet@google.com \
--cc=john.fastabend@gmail.com \
--cc=kuni1840@gmail.com \
--cc=kuniyu@google.com \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=ncardwell@google.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@fomichev.me \
--cc=ukyab@berkeley.edu \
--cc=willemb@google.com \
--cc=yonghong.song@linux.dev \
/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