[PATCH net] xfrm: iptfs: preserve shared-frag marker in iptfs_consume_frags()

[PATCH net] xfrm: iptfs: preserve shared-frag marker in iptfs_consume_frags()

[Takao Sato]

[-- Attachment #1.1: Type: text/plain, Size: 157 bytes --]

Hi

Thank you for the review. Please find v3 attached with the security impact
description removed from the commit message as requested.

Thanks,
Takao Sato

[-- Attachment #1.2: Type: text/html, Size: 207 bytes --]

[-- Attachment #2: 0003-xfrm-iptfs-preserve-shared-frag-marker-v3.patch --]
[-- Type: application/octet-stream, Size: 1496 bytes --]

From 1b0d58b7ae27fdbbb030eaf146def9e279a832fe Mon Sep 17 00:00:00 2001
From: Takao Sato <takaosato1997@gmail.com>
Date: Wed, 20 May 2026 02:41:33 -0300
Subject: [PATCH net v3] xfrm: iptfs: preserve shared-frag marker in
 iptfs_consume_frags()

iptfs_consume_frags() transfers paged fragments from one socket buffer
to another but fails to propagate the SKBFL_SHARED_FRAG flag. This is
the same class of bug that was fixed in skb_try_coalesce() for
CVE-2026-46300: when fragments backed by read-only page-cache pages are
merged, the marker indicating their shared nature must be preserved so
that ESP can decide correctly whether in-place encryption is safe.

Apply the same two-line fix used in skb_try_coalesce() to
iptfs_consume_frags().

Fixes: b96ba312e21c ("xfrm: iptfs: share page fragments of inner packets")
Cc: stable@vger.kernel.org # 6.8+
Signed-off-by: Takao Sato <takaosato1997@gmail.com>
---
 net/xfrm/xfrm_iptfs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/xfrm/xfrm_iptfs.c b/net/xfrm/xfrm_iptfs.c
index 97bc979e5..4db85e158 100644
--- a/net/xfrm/xfrm_iptfs.c
+++ b/net/xfrm/xfrm_iptfs.c
@@ -2168,6 +2168,8 @@ static void iptfs_consume_frags(struct sk_buff *to, struct sk_buff *from)
	memcpy(&toi->frags[toi->nr_frags], fromi->frags,
	       sizeof(fromi->frags[0]) * fromi->nr_frags);
	toi->nr_frags += fromi->nr_frags;
+	if (fromi->nr_frags)
+		toi->flags |= fromi->flags & SKBFL_SHARED_FRAG;
	fromi->nr_frags = 0;
	from->data_len = 0;
	from->len = 0;
-- 
2.43.0

Re: [PATCH net] xfrm: iptfs: preserve shared-frag marker in iptfs_consume_frags()

[Steffen Klassert]

On Thu, May 21, 2026 at 08:34:43PM +0900, Takao Sato wrote:
> Hi
> 
> Thank you for the review. Please find v3 attached

Please send patches inline, not as an attachment and review

Documentation/process/submitting-patches.rst

on how to submitt patches.