From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBE6B44D686; Tue, 16 Jun 2026 16:00:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625636; cv=none; b=m0VZmRbtkna6OR1L+OQIAPgp67jZkfs8QopvHhOLXj4suV4zlJLsNzFmRzIlipvBmUJuvZgsXmOQtTwL3aiX/5jWygTAuNEeqWNPdztSGJ8POfTmJbwJLwFZvjmU7Ow8PF4bnfjcHc3hNIWJYqe83twjMiUW6n3ScC0xsWCYdiA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625636; c=relaxed/simple; bh=yZfQ4uGFxdjYfClbMLn9l0zKCgQFHCwiyMb7+jeh7u4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SXL2c/I50SNVIMTgft/csqYU/bhInibW3fEcpS0pAiFe/vP9Bfj3/Ruy53P3tpv0FLAQ5EXzsHbeSx0c8eD+acNKX/O0kNX+v2eYoazMk3okvQhQilC2r3DzGUf7wNFUS9ngCTwdLL4f6vSB2ce9H6BeJgc2ujlum7fkLPrSlHU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wvTRrtP8; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wvTRrtP8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E67741F000E9; Tue, 16 Jun 2026 16:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781625634; bh=+wSiuLgJFiZTfWRLltYdkvd2JFX0km2TqagC1Beqhf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wvTRrtP8lf6V8j+KH8z0n+QvpFLTV0xdlctvcbZcRKkM7sk0HqVjDbmtlRsv0uYYC DlUAcCRLOZNLWWzh39IMHoLf2+te8vs/V9SjiIsRVyBXYtNjHXcetY8hxCaLECqVVV oku6jvjYULh2J5WjL6M3z4oCnqoTWRtyZ2ErSM8M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Yuan Tan , Yifan Wu , Juefei Pu , Zhengchuan Liang , Xin Liu , Wyatt Feng , Ren Wei , Steffen Klassert Subject: [PATCH 6.18 171/325] xfrm: espintcp: do not reuse an in-progress partial send Date: Tue, 16 Jun 2026 20:29:27 +0530 Message-ID: <20260616145106.354074666@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145057.827196531@linuxfoundation.org> References: <20260616145057.827196531@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wyatt Feng commit c381039ade2e161ab08c0eda73c4f8b9a7115928 upstream. espintcp keeps a single in-flight transmit in ctx->partial. Before building a new sk_msg, espintcp_sendmsg() first tries to flush that state through espintcp_push_msgs(). For blocking callers, espintcp_push_msgs() may return success even when the previous partial send is still pending. espintcp_sendmsg() would then reinitialize emsg->skmsg and reuse ctx->partial while the old transfer still owns that state. Do not rebuild the send message when ctx->partial is still in progress. If espintcp_push_msgs() returns with emsg->len still set, fail the new send instead of overwriting the live partial state. This is a memory-safety fix: reusing the live partial-send state can leave a stale offset attached to a new sk_msg and lead to an out-of- bounds read in the send path. tcp_sendmsg_locked() already handles waiting for send buffer memory, so the fix here is just to preserve espintcp's one-message-at-a-time transmit state. Fixes: e27cca96cd68 ("xfrm: add espintcp (RFC 8229)") Cc: stable@kernel.org Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Zhengchuan Liang Reported-by: Xin Liu Assisted-by: Codex:GPT-5.4 Signed-off-by: Wyatt Feng Signed-off-by: Ren Wei Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/xfrm/espintcp.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/xfrm/espintcp.c +++ b/net/xfrm/espintcp.c @@ -349,6 +349,10 @@ static int espintcp_sendmsg(struct sock err = -ENOBUFS; goto unlock; } + if (emsg->len) { + err = -ENOBUFS; + goto unlock; + } sk_msg_init(&emsg->skmsg); while (1) {