From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=91.218.175.11 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795257319; b=Or+ZDj1imjlpEEA54YeDyWkKnd67UpxlyAmdrXFWR1taCUEtPvCENFo4W+7bajht5Go6 4k04rLAmezax9Ixok1C3bniLako4yjZcdHjXNekABuP3p+oQDInTDjguPTPrpZoRFHcsi 2DgNrjmh2JSYOn+pa1mN35SFtxNLgoxFdEyIe0nk8Tl2c4PRUF46UH1RgXjcaTSMP3r7q x3rNjJwkjdyVPal2THzNiDgnAJDFgfpQ0a1Cqc+zm2AUknddaCpa19jztDn3/znwMXnq2 cl8kR1Z72ishqi41a94YG2XoyddLLLLYCpPsLwOTrGvVP92JJSGp5t3JO5BUPBqWtUw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795257319; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=bjG2Okz8iGgbh3ees3i7reQXyGSwi++CYO+Z/Q8Ttss=; b=MGERwYzhJ5zmsJul6IjU+lq9maO4RfAJqFUyAoeFGfp+NY0KnPRj3Nd3qg9fr5TbAwRT wTdEu7AjdGpMEmpCF1CU3y7HS1W0MiqrgUJ4aSjynyULGfBKa5bsTcVGKLlHL3z3Rx2GE R7pqpFSXWshndENKQOuGEKMJmExvLuXLxRPg6bRJi/lyaELH2b8GR9WSeUrFOecVSuF2y mSDwYU/WeI70vSkqiTBrn8fsH1J5WtYhkXjz56XGdyR7kx7f69a+kXT225I0ZY2JvZGfJ QC20AK+9zSmuwSR0QiZXCy8mXedwlOncrjzVSQ3jw5FJQOr8TvcuoQd4xiU/F6o4uBA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=KbV66rLa; arc=none smtp.remote-ip=91.218.175.11 Received: from mta0.migadu.com (out-11.mta0.migadu.com [91.218.175.11]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2301B606A32A for ; Sat, 21 Nov 2026 10:35:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2301B606A32A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=KbV66rLa X-Envelope-To: netdev@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=YCflmLbeG3eTiOPqoz6EeAAsvzcvl036eUCwFD/lgzA=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795257317; v=1; x=1795862117; b=KbV66rLavEd09iNPFLKlLOR0o/foh3f43LDSDxutDXTrWl+5RQ0icvpnC13nJ/UGgMGOEq1f hZm2caQC5NexHDmaxtqEqID/82K2HvPNgww+UAq5AFqXj1Iw6abk9lzsNDCkltgeXDi8WBlQlb6 ca5idOc7qpnVZzS0X4ekklL0= X-Envelope-To: netdev@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 0bf361dc8874d648; Sat, 21 Nov 2026 10:35:12 +0000 X-Mizu-Trace-ID: 0bf361dc8874d648 X-Migadu-Flow: FLOW_OUT From: Jiayuan Chen To: bpf@vger.kernel.org, ast@kernel.org Cc: Jiayuan Chen , John Fastabend , Jakub Sitnicki , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Willem de Bruijn , Neal Cardwell , Andrii Nakryiko , Eduard Zingerman , Ihor Solodrai , Daniel Borkmann , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Shuah Khan , Sechang Lim , Michal Luczaj , Mattia Meleleo , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 06/11] bpf, sockmap: Fix reconnect with a psock by rejecting disconnect Date: Sat, 21 Nov 2026 18:30:07 +0800 Message-ID: <20261121103222.88209-7-jiayuan.chen@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261121103222.88209-1-jiayuan.chen@linux.dev> References: <20261121103222.88209-1-jiayuan.chen@linux.dev> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 8cc3aef0cb19 ("tcp: Do not allow buggy transitions between ehash and lhash2.") rejects connect() -> disconnect -> listen(), but connect() -> disconnect -> connect() is still allowed. A socket in a sockmap keeps its psock across tcp_disconnect(), and the new connection runs into what the old one left there: - recvmsg() returns the old data still queued on psock->ingress_msg. - psock->copied_seq and psock->ingress_bytes still account for it, so copied_seq runs ahead of rcv_nxt for the rest of the connection. - sk_psock_backlog() does not take the socket lock for ingress, so it can queue old skbs from psock->ingress_skb after the reconnect. Cleaning all of this up on disconnect is hard. Do what TLS did in commit 5071a1e606b3 ("net: tls: explicitly disallow disconnect") and reject the disconnect with -EOPNOTSUPP. Unlike TLS, some callers have to be let through. None of them leads to a reconnect with old data: - A child can be added to a sockmap before accept(), e.g. by a sockops prog. When the listener is closed, inet_child_forget() disconnects the child and frees it right after, without looking at the return value. Such a child has no sk_socket. - close() with a zero linger time disconnects through sk_prot, which is still tcp_bpf as long as somebody else holds the psock. sock_map_close() sets SK_PSOCK_CLOSING for it. - A listener is disconnected by shutdown(SHUT_RD) and connect(AF_UNSPEC), and has no data. Signed-off-by: Jiayuan Chen --- include/linux/skmsg.h | 1 + net/core/sock_map.c | 1 + net/ipv4/tcp_bpf.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h index 98f71c6d0af73..7e8256b2b4d6c 100644 --- a/include/linux/skmsg.h +++ b/include/linux/skmsg.h @@ -70,6 +70,7 @@ enum sk_psock_state_bits { SK_PSOCK_RX_STRP_ENABLED, SK_PSOCK_STRP_DONE_PENDING, SK_PSOCK_TX_BUSY, + SK_PSOCK_CLOSING, }; struct sk_psock_link { diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 6747b3cc1cac1..6fc1d29ac6ed5 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -1763,6 +1763,7 @@ void sock_map_close(struct sock *sk, long timeout) sock_map_remove_links(sk, psock); rcu_read_unlock(); sk_psock_stop(psock); + sk_psock_set_state(psock, SK_PSOCK_CLOSING); release_sock(sk); cancel_delayed_work_sync(&psock->work); sk_psock_put(sk, psock); diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index 077b65927ac8d..9715716518c49 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -710,12 +710,33 @@ static struct proto *tcpv6_prot_saved __read_mostly; static DEFINE_SPINLOCK(tcpv6_prot_lock); static struct proto tcp_bpf_prots[TCP_BPF_NUM_PROTS][TCP_BPF_NUM_CFGS]; +static int tcp_bpf_disconnect(struct sock *sk, int flags) +{ + struct sk_psock *psock; + bool reject; + + /* + * A new connection must not reuse the psock. Let through a child + * that nobody has accepted yet, a socket in close() and a listener. + */ + rcu_read_lock(); + psock = sk_psock(sk); + reject = psock && sk->sk_socket && sk->sk_state != TCP_LISTEN && + !sk_psock_test_state(psock, SK_PSOCK_CLOSING); + rcu_read_unlock(); + if (reject) + return -EOPNOTSUPP; + + return tcp_disconnect(sk, flags); +} + static void tcp_bpf_rebuild_protos(struct proto prot[TCP_BPF_NUM_CFGS], struct proto *base) { prot[TCP_BPF_BASE] = *base; prot[TCP_BPF_BASE].destroy = sock_map_destroy; prot[TCP_BPF_BASE].close = sock_map_close; + prot[TCP_BPF_BASE].disconnect = tcp_bpf_disconnect; prot[TCP_BPF_BASE].recvmsg = tcp_bpf_recvmsg; prot[TCP_BPF_BASE].sock_is_readable = sk_msg_is_readable; prot[TCP_BPF_BASE].ioctl = tcp_bpf_ioctl; -- 2.43.0