From: "Feng zhou" <zhoufeng.zf@bytedance.com>
To: <gregkh@linuxfoundation.org>, <imv4bel@gmail.com>,
<h3xrabbit@gmail.com>, <steffen.klassert@secunet.com>,
<benh@debian.org>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<yangzhenze@bytedance.com>, <wangdongdong.6@bytedance.com>,
<zhoufeng.zf@bytedance.com>
Subject: [PATCH v5.15.205] ipv4: set SKBFL_SHARED_FRAG in the right skb field
Date: Sat, 9 May 2026 13:37:51 +0800 [thread overview]
Message-ID: <20260509053751.45007-1-zhoufeng.zf@bytedance.com> (raw)
From: Feng Zhou <zhoufeng.zf@bytedance.com>
commit ab8b995323e5237041472d07e5055f5f7dcdf15b
("xfrm: esp: avoid in-place decrypt on shared skb frags")
backported the shared frag marking to ip_append_page(), but it writes
SKBFL_SHARED_FRAG to skb_shinfo(skb)->tx_flags.
SKBFL_SHARED_FRAG is a skb_shared_info::flags bit, so storing it in
skb_shinfo(skb)->tx_flags does not mark the skb as carrying shared
frags for later consumers.
Set the bit in skb_shinfo(skb)->flags instead. This makes the
backport actually tag spliced UDP pages as shared and restores the
protection intended for the ESP-in-UDP path.
Fixes: ab8b995323e5237041472d07e5055f5f7dcdf15b ("xfrm: esp: avoid in-place decrypt on shared skb frags")
Signed-off-by: Feng Zhou <zhoufeng.zf@bytedance.com>
---
net/ipv4/ip_output.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 68509e1f89b5b..5d8f8a5901bc6 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1443,7 +1443,7 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
goto error;
}
- skb_shinfo(skb)->tx_flags |= SKBFL_SHARED_FRAG;
+ skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
if (skb->ip_summed == CHECKSUM_NONE) {
__wsum csum;
--
2.39.5
next reply other threads:[~2026-05-09 5:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-09 5:37 Feng zhou [this message]
2026-05-09 6:13 ` [PATCH v5.15.205] ipv4: set SKBFL_SHARED_FRAG in the right skb field Qingfang Deng
2026-05-09 6:30 ` Greg KH
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=20260509053751.45007-1-zhoufeng.zf@bytedance.com \
--to=zhoufeng.zf@bytedance.com \
--cc=benh@debian.org \
--cc=gregkh@linuxfoundation.org \
--cc=h3xrabbit@gmail.com \
--cc=imv4bel@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
--cc=wangdongdong.6@bytedance.com \
--cc=yangzhenze@bytedance.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox