]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bpf: tcp: Fix type confusion in bpf_skc_to_tcp_sock().
authorKuniyuki Iwashima <kuniyu@google.com>
Mon, 4 May 2026 21:04:51 +0000 (21:04 +0000)
committerMartin KaFai Lau <martin.lau@kernel.org>
Fri, 8 May 2026 18:38:10 +0000 (11:38 -0700)
bpf_skc_to_tcp_sock() only checks if sk->sk_protocol is
IPPROTO_TCP, but RAW socket can bypass it:

  socket(AF_INET, SOCK_RAW, IPPROTO_TCP)

Let's use sk_is_tcp().

Fixes: 478cfbdf5f13 ("bpf: Add bpf_skc_to_{tcp, tcp_timewait, tcp_request}_sock() helpers")
Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20260504210610.180150-5-kuniyu@google.com
net/core/filter.c

index cd88633f8dc148a5c37b94f686924a74c08ce0ce..7d945dc2cb92d168b9972c7fa50db65f17b7491c 100644 (file)
@@ -11963,7 +11963,7 @@ const struct bpf_func_proto bpf_skc_to_tcp6_sock_proto = {
 
 BPF_CALL_1(bpf_skc_to_tcp_sock, struct sock *, sk)
 {
-       if (sk && sk_fullsock(sk) && sk->sk_protocol == IPPROTO_TCP)
+       if (sk && sk_fullsock(sk) && sk_is_tcp(sk))
                return (unsigned long)sk;
 
        return (unsigned long)NULL;