From nobody Sat Jun 13 07:15:47 2026 Received: from sg-3-111.ptr.tlmpb.com (sg-3-111.ptr.tlmpb.com [101.45.255.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3E86347DD for ; Sat, 9 May 2026 05:39:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=101.45.255.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778305145; cv=none; b=LVWarb28gpUZLwqrj12aosLZD5Zo7dEl2+WSpBAnrhLFlJmk+QntyYAhypL2nMZCoqZzLXGbSCwKmZi0xbEZL4REFzRZqzx4jM7c/5cC881/UPuMboSAaUQpPkn0KJMU+uUPjAGTnDqy0OIZcEWRiaZTshfKjSo+WsxfxHlMEG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778305145; c=relaxed/simple; bh=s3FIEeW8UUaHN3l/ZqapmL3VuaNw9xvXkKPPK2zklAA=; h=From:Message-Id:Mime-Version:Subject:Date:Content-Type:To:Cc; b=hy+YfWtBNq0lUMin9yawbEvBSqDa/GUAZQOr02kY7k9rAKxYbsMT6wbLzmk2X3Jk7LZOvWTe3zNMC1cCorTCLoD/rjEJhyHKfqNkeek6Z0bfpeiTXIr3nDN3RKv6CDnBP0QxGLf4XMY3Glm7I15uy4vMqnHv+iZSvAHrrlM2LEw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=TuVOmt6j; arc=none smtp.client-ip=101.45.255.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="TuVOmt6j" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=2212171451; d=bytedance.com; t=1778305093; h=from:subject: mime-version:from:date:message-id:subject:to:cc:reply-to:content-type: mime-version:in-reply-to:message-id; bh=jSc7LlSz/x0lQKhonWao64exX9IprUKxVC59jaARhcY=; b=TuVOmt6jkStq5jpp4J+cSvRsgiYNnIg6+Ffs13gv8NxWeBtEiUV3LRr2DxseRz3BfeqC34 t42M4EmYQ74OBM+FS9ejjIVBm2cTeVhoZ/g0qzk5dlx4zGhJuA3VR+e+P4GZr47/hOhLGb M5B7SbYbVd+xJXMaOzRhxw80TDrNwuI6p9cbQryeNcuEKUvhHAd7VR+or3eNFl1czlhIcR Qpdt7mPj8nYpKK2Y5XmupIRQ8ckFN7WTW478KW2P04un3Sjx45yafhSjx2G1kXCK7XpkJh haF5J7NCVWT8ahrwiHFe16AORsfimiUyGMnOcUOQcdkaaBARM0pnaqkjJhjjlQ== From: "Feng zhou" Message-Id: <20260509053751.45007-1-zhoufeng.zf@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Original-From: Feng zhou Subject: [PATCH v5.15.205] ipv4: set SKBFL_SHARED_FRAG in the right skb field Date: Sat, 9 May 2026 13:37:51 +0800 Content-Transfer-Encoding: quoted-printable To: , , , , Cc: , , , , X-Mailer: git-send-email 2.50.1 X-Lms-Return-Path: Content-Type: text/plain; charset="utf-8" From: Feng Zhou 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 --- 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; } =20 - skb_shinfo(skb)->tx_flags |=3D SKBFL_SHARED_FRAG; + skb_shinfo(skb)->flags |=3D SKBFL_SHARED_FRAG; =20 if (skb->ip_summed =3D=3D CHECKSUM_NONE) { __wsum csum; --=20 2.39.5