From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from va-2-115.ptr.blmpb.com (va-2-115.ptr.blmpb.com [209.127.231.115]) (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 0A7CF29B79B for ; Sat, 9 May 2026 05:38:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.127.231.115 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778305106; cv=none; b=Z8kFxDNYptfjhFC5Uf1ITF+f/xd9If0LtZt8aPjxCeTa17lpqwk0icZBwFObxK2IrpJqXXJf0J+YufNAlSkxyTJzaE0s2D5SQNRQSkwUXPXIWdZSRaAZcmU+qHJNqklnrxLkx3n5GUp/WNrr32+8tWOtjDIWhX74eBYfZyzkbCY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778305106; c=relaxed/simple; bh=s3FIEeW8UUaHN3l/ZqapmL3VuaNw9xvXkKPPK2zklAA=; h=From:Message-Id:Mime-Version:Subject:Date:Content-Type:To:Cc; b=lbN5Zz6MUsWUY1ADsdG9y0OR/xEO9U/NNs5r36oBv9zMFZcVt0FZ9ef2/mx/JZNYyK7ZS4UjMKK/irQHbPJAn6GuC8Wz6a6ar1q1C3pcEdH6k46qU6JWwnHkYrQCJVdLXIXnViZpi9ttghOH8wkjf3IXRkPd71vXzhlgU+03/yQ= 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=209.127.231.115 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: netdev@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: 7bit Content-Type: text/plain; charset=UTF-8 To: , , , , Cc: , , , , X-Mailer: git-send-email 2.50.1 X-Lms-Return-Path: 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; } - 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