Skip to content

Commit 8cb4944

Browse files
wbowlingKyleGospo
authored andcommitted
[FROM-ML] net: skbuff: preserve shared-frag marker during coalescing
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>
1 parent 145b6d2 commit 8cb4944

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
@@ -6226,6 +6226,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
62266226
from_shinfo->frags,
62276227
from_shinfo->nr_frags * sizeof(skb_frag_t));
62286228
to_shinfo->nr_frags += from_shinfo->nr_frags;
6229+
if (from_shinfo->nr_frags)
6230+
to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG;
62296231

62306232
if (!skb_cloned(from))
62316233
from_shinfo->nr_frags = 0;

0 commit comments

Comments
 (0)