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 BFB863346A6; Tue, 21 Jul 2026 18:39:49 +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=1784659191; cv=none; b=lIjmx8zA42da37DLMm/xcF62eDIMZgEA1g+HHkEZ8TSb3k92/O5G8CoGtqYZkwq1Fyv3DVGr8tolGcYQHSoRk/emFXFc9uL1PtsxrQZSBRr3J01C+tWcJ1qkPtdDM4pUxqMRafB7/QrZVDlLoyMsPa8PbwuZuPdRaIRXC/6G6YU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784659191; c=relaxed/simple; bh=fpI0EllFJ/9niY0hZQpdC9kOypxCHqdZneY/0hDsgAc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LGXRPUvMpA2Fw+KSyo0Kc2wH27c/i03hWFF0v5bvXFzP0W2Ca0cfrHOBRxWIokmzdOedIRGA+CGpOaWfWHPhbBo9eBInJ6q6L4UgE7LllBg2RVURtKCzw2DC9Ng1E7ZdPX7TUW1t0a/EAI35loH802rhVN3nkqk74I1MCndeOP4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VeYOPW9J; 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="VeYOPW9J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D37D71F000E9; Tue, 21 Jul 2026 18:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784659189; bh=CdJ2KGmRCaeCsFfYNwEh4ac5J8EvcgsINb+r0/wYOK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VeYOPW9JvKI9W8kao4m0S5Uq5KK/Tu1mEniyaFidDTCaFPmeb7E6sSaiHpCrQWTdv P6j4MBzLTf9zaJd5LwC0fCATNuYaHaHGeKrj9OFQTQbPZj6LtwdRGKhZNlpOxYkTaY g1yGhjUiQg0t/BJYzErat09B8dsQhM77a5qqg/ao= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Aaron Esau , Yiming Qian , Sabrina Dubroca , Steffen Klassert Subject: [PATCH 6.18 1426/1611] espintcp: use sk_msg_free_partial to fix partial send Date: Tue, 21 Jul 2026 17:25:42 +0200 Message-ID: <20260721152547.511129972@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@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: Sabrina Dubroca commit 007800408002d871f5699bdb944f985896730b8f upstream. sk_msg_free_partial() ensures consistency of the skmsg at every iteration, without having to manually handle uncharges and offsets. This simplifies the code, and fixes some bugs in skmsg accounting when we don't send the full contents. Cc: stable@vger.kernel.org Fixes: e27cca96cd68 ("xfrm: add espintcp (RFC 8229)") Reported-by: Aaron Esau Reported-by: Yiming Qian Signed-off-by: Sabrina Dubroca Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/xfrm/espintcp.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) --- a/net/xfrm/espintcp.c +++ b/net/xfrm/espintcp.c @@ -215,43 +215,23 @@ static int espintcp_sendskmsg_locked(str struct sk_msg *skmsg = &emsg->skmsg; bool more = flags & MSG_MORE; struct scatterlist *sg; - int done = 0; int ret; - sg = &skmsg->sg.data[skmsg->sg.start]; do { struct bio_vec bvec; - size_t size = sg->length - emsg->offset; - int offset = sg->offset + emsg->offset; - struct page *p; - - emsg->offset = 0; + sg = &skmsg->sg.data[skmsg->sg.start]; if (sg_is_last(sg) && !more) msghdr.msg_flags &= ~MSG_MORE; - p = sg_page(sg); -retry: - bvec_set_page(&bvec, p, size, offset); - iov_iter_bvec(&msghdr.msg_iter, ITER_SOURCE, &bvec, 1, size); - ret = tcp_sendmsg_locked(sk, &msghdr, size); - if (ret < 0) { - emsg->offset = offset - sg->offset; - skmsg->sg.start += done; + bvec_set_page(&bvec, sg_page(sg), sg->length, sg->offset); + iov_iter_bvec(&msghdr.msg_iter, ITER_SOURCE, &bvec, 1, sg->length); + ret = tcp_sendmsg_locked(sk, &msghdr, sg->length); + if (ret < 0) return ret; - } - if (ret != size) { - offset += ret; - size -= ret; - goto retry; - } - - done++; - put_page(p); - sk_mem_uncharge(sk, sg->length); - sg = sg_next(sg); - } while (sg); + sk_msg_free_partial(sk, skmsg, ret); + } while (skmsg->sg.size); memset(emsg, 0, sizeof(*emsg));