All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: Takao Sato <takaosato1997@gmail.com>
Cc: <netdev@vger.kernel.org>, <w@1wt.eu>, <davem@davemloft.net>,
	<herbert@gondor.apana.org.au>, <chopps@chopps.org>,
	<pfalcato@suse.de>, <stable@vger.kernel.org>
Subject: Re: [PATCH net v4] xfrm: iptfs: preserve shared-frag marker in iptfs_consume_frags()
Date: Tue, 26 May 2026 12:30:13 +0200	[thread overview]
Message-ID: <ahV2NRIqdbW-kDDx@secunet.com> (raw)
In-Reply-To: <20260526004035.1023696-1-takaosato1997@gmail.com>

On Mon, May 25, 2026 at 09:40:35PM -0300, Takao Sato wrote:
> 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.14+
> Signed-off-by: Takao Sato <takaosato1997@gmail.com>
> ---
> Changes since v3:
> - Corrected Cc: stable tag from "# 6.8+" to "# 6.14+". IPTFS was
>   introduced in v6.14, so earlier stable branches do not need this
>   fix. Pointed out by Pedro Falcato.
> 
> Changes since v2:
> - Removed security impact paragraph from commit message as requested
>   by Steffen Klassert.
> 
>  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;

Your patch does not apply to the ipsec tree, please
rebase on top of it.

Thanks!

  reply	other threads:[~2026-05-26 10:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-26  0:40 [PATCH net v4] xfrm: iptfs: preserve shared-frag marker in iptfs_consume_frags() Takao Sato
2026-05-26 10:30 ` Steffen Klassert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-05-22 14:25 [PATCH net v3] " Takao Sato
2026-05-26  0:35 ` [PATCH net v4] " Takao Sato

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ahV2NRIqdbW-kDDx@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=chopps@chopps.org \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=netdev@vger.kernel.org \
    --cc=pfalcato@suse.de \
    --cc=stable@vger.kernel.org \
    --cc=takaosato1997@gmail.com \
    --cc=w@1wt.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.