From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.129 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795257264; b=a5EhrUBKGYTVKv0mq5Me/SwG6O5SqQ3MBljEkCtif0EL5Lk4W6JoBsulKzj+vXaX1rr0 4Rmoy3vszjYs0HbpnHCb34H/6xz2DZocQsIgBV5pDbOp2jL+8bYHrPxJbnCz7pFC58Vya Ew5uSGfW64cZc8ZM9NFHVT+LO9Av/qqPfDplYt19jIv/lhjtW84i17PxeGtJfxjG6o8SF n2g4wvi8sgkeTvz5j6BgT4gw2uTNDqbEtLtp/7n8nWIQyLsjTb1PJ8LzJudATZOumS8o6 LEvyuYxCXePYq7Domt7rDogfIwfGNKTfbcHTrWruBicTawbPVGuDMLolW9bXLKdiyrA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795257264; 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=Nc48zS1pvPQXpcOFDxpy9yc01fZs/NHTVYQQcYjGPTc=; b=0PSk3qRUsYsni6CERn/2V51hKaselCe6Xh8y8HzS1Kz8zYbKXy1g11ttohnZth6P/uU5 gJBcMsPyfFoPzo31OxYDVF/9Wsl52Slr+xjwL7LGc9Tppkux9NKdKP6468OElsH1zuP2v PjRonN3/X4LoBFzorRYVzSNHxJTBQ8Kq28FX34wIBmY5wB5G8KnGAY/lhbfKniSbPGQLH k/7/Xzl1eSd9D1HnTCyUNChpIttauHy4yOCNwldYyx5RYl2i3+7pLYR7Yh3i8h9hb3MHx arAQENTnpoLduJwKvvf9P5oxLET50cAYOZsd1ameXg1qHXujTTt60tbE4v8BsRgREIQ== 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=IlIE+6d0; arc=none smtp.remote-ip=95.215.58.129 Received: from mta1.migadu.com (out-129.mta1.migadu.com [95.215.58.129]) (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 6E3B8606A32A for ; Sat, 21 Nov 2026 10:34:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 6E3B8606A32A 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=IlIE+6d0 X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=d0Zx0VgqM4r7n2EGcrwfr6pCsmUZw+5S5+NxgBb7BDY=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795257261; v=1; x=1795862061; b=IlIE+6d0Fw2t21lFD3sbsZIe4TxndE7H7JkCpuaGK+XAELCyU8pjSnZRnTwutev/Ed6PtN89 u45KqRx5hrHlaKNxGi4TafWfSocwjdtMs49Ra1s3mj2M+ppZF+VPdiLcmN2RnQa3P4yc2ki91gq paiEPltMTNLysFd8LbxBa23k= X-Envelope-To: linux-kernel@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id ebcdaf32079d6eb0; Sat, 21 Nov 2026 10:34:21 +0000 X-Mizu-Trace-ID: ebcdaf32079d6eb0 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 , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , Shuah Khan , Sechang Lim , Mattia Meleleo , Michal Luczaj , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 04/11] bpf, sockmap: Fix empty sk_msg queued by ingress redirect Date: Sat, 21 Nov 2026 18:30:05 +0800 Message-ID: <20261121103222.88209-5-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: linux-kernel@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 An SK_MSG program can pop the whole message with bpf_msg_pop_data() and then redirect it with BPF_F_INGRESS. tcp_bpf_send_verdict() does not check for that and calls bpf_tcp_ingress() with nothing to send. Its do-while loop still walks the empty ring, charges zero bytes and queues a zero sized sk_msg on the peer's ingress_msg. __sk_msg_recvmsg() hits the zero length element first, returns -EFAULT and never dequeues it, so every later message on that socket sits behind it and recvmsg() keeps failing. Only tearing down the psock gets rid of it. Return early from bpf_tcp_ingress() when the message is empty. SK_PASS and egress redirect already send nothing in that case. Fixes: 7246d8ed4dcc ("bpf: helper to pop data from messages") Signed-off-by: Jiayuan Chen --- net/ipv4/tcp_bpf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index e59103e77aa5f..7191b95c7b1c7 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -39,6 +39,9 @@ static int bpf_tcp_ingress(struct sock *sk, struct sk_psock *psock, struct sk_msg *tmp; int i, ret = 0; + if (!msg->sg.size) + return 0; + tmp = kzalloc_obj(*tmp, __GFP_NOWARN | GFP_KERNEL); if (unlikely(!tmp)) return -ENOMEM; -- 2.43.0