From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 CF5113EF649 for ; Fri, 15 May 2026 22:28:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778884141; cv=none; b=W6BraHQOByKUNvgoBHlfI6+rexcpgTVQqEursM6nuBdLu8GRETWGjSeKb84dIVGMX23k/TxJudtV7XvTpww7U0NSBHIsoP9pb2lG08Ma2B0dyWyUOW8cWEG5KCLX9+e1t6M4IBbsya5uPn9D8YrBd7A3QCXJV+mVME1YCMtcG+o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778884141; c=relaxed/simple; bh=aGmAtHHcir/8kQqVKi/Xn+nLoHQb9rYIl7b8rLXZWwA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=D2UFfL8tOVe1E7lh9uoJ9Vt7bkAsptCAfw/KBaVOJ8a37M2M3Vrm36RyYaZdbeCtudVghsnkKVrzKZXQ5lRavnThntaoHW41d7f9LT19gRyk5FIDyz7cg+3Zb94aPgxCCYumzcQ/OYvciug8W75NMM1k0Yx4NdXatiqKNDll2Jw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BolM1PKg; arc=none smtp.client-ip=209.85.216.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BolM1PKg" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-36974221f93so12492a91.2 for ; Fri, 15 May 2026 15:28:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778884139; x=1779488939; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=0mUBdLpThxzKu9Liq0g3UUpqLlKdRPYUPjPABtznf7g=; b=BolM1PKgVJU+RW050qCJgbmlgm3bSQFYA1tgMl54vowdr30PjJPQJEURqDlaRdOuL5 EWxRRJtJjsbyCjTdsp9CQ+Ea8IwgQ3hGvhdf+0sBaeb2IHDircsQsyBBUuZXLmKxfPOk TFvwvEGhhnKajCencjdzxxMyEJwBMiJmy4/JR0t57cYMVoozzh0d5IYlAjxopyMn9AQQ cwBypBrIlhtVwIx5NunCiQ8lpCmhnXjLuVyEMMupa8cTbYVRYqAQnd1yxB8BX0aMpWqJ SdJZeb9Rbr5fy2SIwmneODjxSRHGUr5jszOAh4xp6T2sdn23o9idRAm5WTJpAdDTaYBO MpJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778884139; x=1779488939; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0mUBdLpThxzKu9Liq0g3UUpqLlKdRPYUPjPABtznf7g=; b=UgFD35XWtQHYruwYHki4JUcUKdZ3Ekln11oBgxIzlQm8XpAOrpwBCHpya7irQ16wK0 PKyzbNO5gnXKnim1p3W/3R9+HJjMxkM/FRANMm+cgVRTq0BqW7MwnmeV0ZKA+6D1yYCg PxIMCyaW1752+xdckL75e/gy+txd/e13rLx4YG6/UwQCDJlFp8VIIQ3/vkeeXd8dN1U0 ZYlGjCglC8V+vCNZroH7wFMgsRZwaN+bKEHqRqSJe5VxBQC4TY4vt03uuFShCIHPnB5H KRDHH89pdTtWWwnNrwuYq8p99t/G/hW/YFuCMn3vMDcskxOE9rbYY49zrhU2Ldujpa/M bogA== X-Forwarded-Encrypted: i=1; AFNElJ8jMkKGBZ82GJr9QYF6bqRAt36JgRZulmO0RNLPRX1WVvxex2+AZ+QDgKWeyE1uxyUo0ydZKa4=@vger.kernel.org X-Gm-Message-State: AOJu0YzrsmTzPPNeTg91AnHW5vRoiDinlG4O6eZ2DtWcVBhWd/dBWZVi BJcB2QAA7mgbMFmhf33ysX0mVo2E8z58nkzW5gzZwDfX0Z5WEclwIvgO X-Gm-Gg: Acq92OGxAEJq+uXN6KriF3WKW6FTRs0zLtRk1EbFTHWjsd5xx9z/VKsE4denlGS6767 VyRJSQjuVc6fljzBkK2F0v7sUJtGwM8vqHVR4Cr+HLO7zkkkDmH4DY+tRjIWGU0+9FzXvgLkRdT /YW02Kv63ITag8Cdwe/YQllB9rfAHpHbnVO43LBwCheup2UL+XUkURoK7hF+Sr6IHAL/8sD6SJS 0RrGT8pmgPf5Y7agDhxUd7mbraxNf7G5k8lbpwxsNKJ8EP9X48gLq1NC1EdETfVfdsV/2Dh/qnR B9gRx5DaK7vriQu5kI/ViSCcj0jXEPv6LlkrAeOv9ukHnLlw6bM0toR26ErNELFAYP2elX01EGU UYbQcq2TwxEEVOIVq+it/n9Xz7SfiJpw8sJwOejlm9W8h3HuQC+qnoeIglUNeBddioMaha0EmR1 amNJ77j5LQhvBQeJ5yPge7V04pkYI8TjBo+yjC+4eJDC8= X-Received: by 2002:a17:90b:38cf:b0:35f:b647:d98a with SMTP id 98e67ed59e1d1-369519c6bcfmr5722103a91.5.1778884138863; Fri, 15 May 2026 15:28:58 -0700 (PDT) Received: from v4bel ([58.123.110.97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5c26355csm67761435ad.35.2026.05.15.15.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 15:28:58 -0700 (PDT) Date: Sat, 16 May 2026 07:28:53 +0900 From: Hyunwoo Kim To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, kerneljasonxing@gmail.com, kuniyu@google.com, mhal@rbox.co, jiayuan.chen@linux.dev, steffen.klassert@secunet.com, ben@decadent.org.uk, herbert@gondor.apana.org.au, dsahern@kernel.org, sultan@kerneltoast.com, sd@queasysnail.net, malin89@huawei.com, tanjingguo@huawei.com, aaron1esau@gmail.com Cc: netdev@vger.kernel.org, stable@vger.kernel.org, imv4bel@gmail.com Subject: [PATCH net v5] net: skbuff: propagate shared-frag marker through frag-transfer helpers Message-ID: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Two frag-transfer helpers (__pskb_copy_fclone() and skb_shift()) fail to propagate the SKBFL_SHARED_FRAG bit in skb_shinfo()->flags when moving frags from source to destination. __pskb_copy_fclone() defers the rest of the shinfo metadata to skb_copy_header() after copying frag descriptors, but that helper only carries over gso_{size,segs, type} and never touches skb_shinfo()->flags; skb_shift() moves frag descriptors directly and leaves flags untouched. As a result, the destination skb keeps a reference to the same externally-owned or page-cache-backed pages while reporting skb_has_shared_frag() as false. The mismatch is harmful in any in-place writer that uses skb_has_shared_frag() to decide whether shared pages must be detoured through skb_cow_data(). ESP input is one such writer (esp4.c, esp6.c), and a single nft 'dup to ' rule -- or any other nf_dup_ipv4() / xt_TEE caller -- is enough to land a pskb_copy()'d skb in esp_input() with the marker stripped, letting an unprivileged user write into the page cache of a root-owned read-only file via authencesn-ESN stray writes. Set SKBFL_SHARED_FRAG on the destination whenever frag descriptors were actually moved from the source. skb_copy() and skb_copy_expand() share skb_copy_header() too but linearize all paged data into freshly allocated head storage and emerge with nr_frags == 0, so skb_has_shared_frag() returns false on its own; they need no change. The same omission exists in skb_gro_receive() and skb_gro_receive_list(). The former moves the incoming skb's frag descriptors into the accumulator's last sub-skb via two paths (a direct frag-move loop and the head_frag + memcpy path); the latter chains the incoming skb whole onto p's frag_list. Downstream skb_segment() reads only skb_shinfo(p)->flags, and skb_segment_list() reuses each sub-skb's shinfo as the nskb -- both p and lp must carry the marker. The same omission also exists in tcp_clone_payload(), which builds an MTU probe skb by moving frag descriptors from skbs on sk_write_queue into a freshly allocated nskb. The helper falls into the same family and warrants the same fix for consistency; no TCP TX-side in-place writer is currently known to reach a user page through this gap, but a future consumer depending on the marker would regress silently. The same omission exists in skb_segment(): the per-iteration flag merge takes only head_skb's flag, and the inner switch that rebinds frag_skb to list_skb on head_skb-frags exhaustion does not fold the new frag_skb's flag into nskb. Fold frag_skb's flag at both sites so segments drawing frags from frag_list members carry the marker. Fixes: cef401de7be8 ("net: fix possible wrong checksum generation") Fixes: f4c50a4034e6 ("xfrm: esp: avoid in-place decrypt on shared skb frags") Suggested-by: Sabrina Dubroca Suggested-by: Sultan Alsawaf Suggested-by: Ben Hutchings Suggested-by: Lin Ma Suggested-by: Jingguo Tan Suggested-by: Aaron Esau Cc: stable@vger.kernel.org Signed-off-by: Hyunwoo Kim --- Changes in v5: - Propagate SHARED_FRAG in skb_segment() - v4: https://lore.kernel.org/all/aga1VyHpHaUhnGZa@v4bel/ Changes in v4: - Include the tcp_clone_payload() propagation suggested by Sabrina - Drop the skb_try_coalesce() change; addressed by commit f84eca581739. - v3: https://lore.kernel.org/all/agW4vC0r8QOUKtRT@v4bel/ Changes in v3: - Include the skb_gro_receive() audit patch suggested by Sultan - v2: https://lore.kernel.org/all/agToIEDI4TaTNLRb@v4bel/ Changes in v2: - Also propagate SHARED_FRAG in skb_try_coalesce() and skb_shift() - v1: https://lore.kernel.org/all/agRfuVOeMI5pbHhY@v4bel/ --- net/core/gro.c | 4 ++++ net/core/skbuff.c | 9 ++++++++- net/ipv4/tcp_output.c | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/net/core/gro.c b/net/core/gro.c index 31d21de5b15a..9f8960789b2c 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -213,10 +213,12 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) p->data_len += len; p->truesize += delta_truesize; p->len += len; + skb_shinfo(p)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG; if (lp != p) { lp->data_len += len; lp->truesize += delta_truesize; lp->len += len; + skb_shinfo(lp)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG; } NAPI_GRO_CB(skb)->same_flow = 1; return 0; @@ -244,6 +246,8 @@ int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb) p->truesize += skb->truesize; p->len += skb->len; + skb_shinfo(p)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; + NAPI_GRO_CB(skb)->same_flow = 1; return 0; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 9c4e8d331d6d..44ac121cfccb 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2248,6 +2248,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom, skb_frag_ref(skb, i); } skb_shinfo(n)->nr_frags = i; + skb_shinfo(n)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; } if (skb_has_frag_list(skb)) { @@ -4349,6 +4350,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen) tgt->ip_summed = CHECKSUM_PARTIAL; skb->ip_summed = CHECKSUM_PARTIAL; + skb_shinfo(tgt)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; + skb_len_add(skb, -shiftlen); skb_len_add(tgt, shiftlen); @@ -4959,7 +4962,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, skb_copy_from_linear_data_offset(head_skb, offset, skb_put(nskb, hsize), hsize); - skb_shinfo(nskb)->flags |= skb_shinfo(head_skb)->flags & + skb_shinfo(nskb)->flags |= (skb_shinfo(head_skb)->flags | + skb_shinfo(frag_skb)->flags) & SKBFL_SHARED_FRAG; if (skb_zerocopy_clone(nskb, frag_skb, GFP_ATOMIC)) @@ -4976,6 +4980,9 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, nfrags = skb_shinfo(list_skb)->nr_frags; frag = skb_shinfo(list_skb)->frags; frag_skb = list_skb; + + skb_shinfo(nskb)->flags |= skb_shinfo(frag_skb)->flags & SKBFL_SHARED_FRAG; + if (!skb_headlen(list_skb)) { BUG_ON(!nfrags); } else { diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index f9d8755705f7..6e4bb411dc04 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2626,6 +2626,7 @@ static int tcp_clone_payload(struct sock *sk, struct sk_buff *to, todo = min_t(int, skb_frag_size(fragfrom), probe_size - len); len += todo; + skb_shinfo(to)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; if (lastfrag && skb_frag_page(fragfrom) == skb_frag_page(lastfrag) && skb_frag_off(fragfrom) == skb_frag_off(lastfrag) + -- 2.43.0