From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 A81DA1F2380 for ; Wed, 13 May 2026 21:07:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778706472; cv=none; b=sKGcqTnX6rWMbr5kAsJdeydE/OzvFFIC+GLl7KenQ/7itb1/AcaArx7ijdcpr1I64TnAO7Zg8yKH4vo6c8MDjDTuA2paj72QL27p3QARfQ70CZJxXS+lBBtqBxFqop17DkACU05urrc9n+125L/DwKiB2WoibRobeJvrl7tas24= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778706472; c=relaxed/simple; bh=uKjpy6mZcAKH6MrZUZmS6VAiqXKWfj84zFJxwe+av8I=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=V6bRm219Ym4OMx/tGN5Ud3nLaI5gWQuDNIYpQazQFZVl+n1uFIB7BvgKyasj5Ys8m8+8FILu4eGSX3qU1RI+PnNQr6cjh3NcrrZ3FqPPKka51hQfG2iaOh/HKXWzNVNPYtri7jINmfZb1gsefQDKrC3Dc6jzjpBdu4LxIHZKb5s= 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=QyT84jP3; arc=none smtp.client-ip=209.85.216.51 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="QyT84jP3" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-36900945df5so720120a91.0 for ; Wed, 13 May 2026 14:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778706470; x=1779311270; 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=lmUB95Voc4Y//0lmslcCl8gB+7WwYY40nezEV7x/XVs=; b=QyT84jP3xP8jgw/9kq+ZWcpg4BflotMXsohLI7UhHnOX/brBb+Q/RVHhcB29eUfgIX CWBP3xZLZTbrsdd6dkrlL7Amjo6tBrbStp0eP1aqs7tjh2Ad3DzeKK5WHngTbFfUL87d 4cfLLgztJ4LFrfz1meZAxfnNIbGFlhBbrr24gN+O0HAFNEWoj3WPGrLod0CckBGaHmum d0P7Sfhey3oycHPEtP7DcmkmtqXXyxAyKrxQpN4InWccQeE/bsrqxBy7+c3lKqM0DKh1 DqkBJQHKH07RhxvHDrRC3P+gK9sw7sb8ILi6xveXXh0coPotfz86ZyCkGs2NK3UzcEpF M+fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778706470; x=1779311270; 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=lmUB95Voc4Y//0lmslcCl8gB+7WwYY40nezEV7x/XVs=; b=opdt/bO83bqmmwVekorhqmwydBbw7G5KxP+dxDJdcIfBfFOnUMXB4MnJXXFSf6wcpj 02qun79q73GTooMuXFul6LuTwCaHFRHW7dDUJ6B1W6uWLtP3YDOQ4tE0ZxFbu4klTo/o HZlWXBHK9kFA3s+1pMo3IaeGgo4N62YAhoPYdHb4k0v8uxw55vDLeaNT6AoNjY0wnrTq AbeA0KoEFDCg2mnAj5BLZvgG6+HT8SEffWJfbVM4X+C5Kn1mSK1nrh8S+eJVUW8/bL/v N9g/dAFUwVOquMn1+3NgZIGc5o1dPR5+5X+ZPsjSAcyK5kLxqMvql+NZAbqIFulkI3VO QN2A== X-Gm-Message-State: AOJu0YwbbRc3NBxjRDdG90xMU/1yORg4pguEZG+yn4PaJKZBLk2Zb2iV +XaKdNk/ymK+2Wu4qYkesHnGDuHrcpd8jvFvijipbMJZU06LlBFZ6iz9 X-Gm-Gg: Acq92OF+/S0lBY3Zs6WC9Wa+XBaZAz57jEjmnxTr9ahTlQOm9tzcN87OvT/fs5JFdgW Wk6UH80pqsdU6djbd+i4w/RSaMI/Xg4e9szTowAGgE0Q4Lem9iakvIMlZhk0a15mOIUpPo1S/mh TUjxbbrY4tRxMYmmy2xmjQWOiSxdIj57ywni1SfWW1oBPCcRBBDI7/70Dl31Bf2afkPDS9M02Uk VusPHMQRw/dlUIJLUFlyyCTUVL7lJOIQ40c/z/+JsDjCfcwvF3IJRuI7aU4NSlXAtRx30EgL/En cqASOHZiLTheNMcoxvxEn9Ydyn/XkPrO7ayEwg1PMf4VpuI2bm5VyalrsVFNXbgcEgnB56i2zf4 TvGhLpHwo8Z2BpfhXvwPqLqUvoH0qGueXLWogUAc6qLCmDPBn1NGJL55wHo+gHIOwuig61tU27T XIUyzd5ozdikphGrxQCcJymFLDSrufTurG/tiAXLAPvM5RtN8BiFIknw== X-Received: by 2002:a17:90a:c105:b0:368:5367:d681 with SMTP id 98e67ed59e1d1-368f782ef5amr4634594a91.10.1778706469883; Wed, 13 May 2026 14:07:49 -0700 (PDT) Received: from v4bel ([58.123.110.97]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3692e72c584sm189648a91.6.2026.05.13.14.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 14:07:49 -0700 (PDT) Date: Thu, 14 May 2026 06:07:44 +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, vakzz@zellic.io, ben@decadent.org.uk, herbert@gondor.apana.org.au, dsahern@kernel.org Cc: netdev@vger.kernel.org, stable@vger.kernel.org, imv4bel@gmail.com Subject: [PATCH net v2] net: skbuff: propagate shared-frag marker through frag-transfer helpers Message-ID: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Three frag-transfer helpers (__pskb_copy_fclone(), skb_try_coalesce(), 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_try_coalesce() and skb_shift() move frag descriptors directly and leave 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. Fixes: cef401de7be8 ("net: fix possible wrong checksum generation") Fixes: f4c50a4034e6 ("xfrm: esp: avoid in-place decrypt on shared skb frags") Reported-by: William Bowling Reported-by: Hyunwoo Kim Cc: stable@vger.kernel.org Signed-off-by: Hyunwoo Kim --- Changes in v2: - Also propagate SHARED_FRAG in skb_shift() - v1: https://lore.kernel.org/all/agRfuVOeMI5pbHhY@v4bel/ --- net/core/skbuff.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7dad68e3b518..7cd388504297 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); @@ -6200,6 +6203,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, from_shinfo->frags, from_shinfo->nr_frags * sizeof(skb_frag_t)); to_shinfo->nr_frags += from_shinfo->nr_frags; + if (from_shinfo->nr_frags) + to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG; if (!skb_cloned(from)) from_shinfo->nr_frags = 0; -- 2.43.0