Skip to content

Commit 760e1ad

Browse files
wbowlinggregkh
authored andcommitted
net: skbuff: preserve shared-frag marker during coalescing
commit f84eca5 upstream. skb_try_coalesce() can attach paged frags from @from to @to. If @from has SKBFL_SHARED_FRAG set, the resulting @to skb can contain the same externally-owned or page-cache-backed frags, but the shared-frag marker is currently lost. That breaks the invariant relied on by later in-place writers. In particular, ESP input checks skb_has_shared_frag() before deciding whether an uncloned nonlinear skb can skip skb_cow_data(). If TCP receive coalescing has moved shared frags into an unmarked skb, ESP can see skb_has_shared_frag() as false and decrypt in place over page-cache backed frags. Propagate SKBFL_SHARED_FRAG when skb_try_coalesce() transfers paged frags. The tailroom copy path does not need the marker because it copies bytes into @to's linear data rather than transferring frag descriptors. Fixes: cef401d ("net: fix possible wrong checksum generation") Fixes: f4c50a4 ("xfrm: esp: avoid in-place decrypt on shared skb frags") Signed-off-by: William Bowling <vakzz@zellic.io> Reviewed-by: Eric Dumazet <edumazet@google.com> Tested-by: Jiayuan Chen <jiayuan.chen@linux.dev> Link: https://patch.msgid.link/20260513041635.1289541-1-vakzz@zellic.io Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0bbbff0 commit 760e1ad

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

net/core/skbuff.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6066,6 +6066,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
60666066
from_shinfo->frags,
60676067
from_shinfo->nr_frags * sizeof(skb_frag_t));
60686068
to_shinfo->nr_frags += from_shinfo->nr_frags;
6069+
if (from_shinfo->nr_frags)
6070+
to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG;
60696071

60706072
if (!skb_cloned(from))
60716073
from_shinfo->nr_frags = 0;

0 commit comments

Comments
 (0)