Skip to content

Commit 12401fc

Browse files
V4belgregkh
authored andcommitted
net: skbuff: propagate shared-frag marker through frag-transfer helpers
commit 48f6a53 upstream. 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 <local>' 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: cef401d ("net: fix possible wrong checksum generation") Fixes: f4c50a4 ("xfrm: esp: avoid in-place decrypt on shared skb frags") Suggested-by: Sabrina Dubroca <sd@queasysnail.net> Suggested-by: Sultan Alsawaf <sultan@kerneltoast.com> Suggested-by: Ben Hutchings <ben@decadent.org.uk> Suggested-by: Lin Ma <malin89@huawei.com> Suggested-by: Jingguo Tan <tanjingguo@huawei.com> Suggested-by: Aaron Esau <aaron1esau@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com> Tested-by: Rajat Gupta <rajat.gupta@oss.qualcomm.com> Link: https://patch.msgid.link/ageeJfJHwgzmKXbh@v4bel Signed-off-by: Paolo Abeni <pabeni@redhat.com> [bwh: Backported to 6.1: - skb_gro_receive_list() is in net/ipv4/udp_offload.c here - Drop change to tcp_clone_payload(), which does not exist here ] Signed-off-by: Ben Hutchings <benh@debian.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9d3e5fd commit 12401fc

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

net/core/gro.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,12 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
281281
p->data_len += len;
282282
p->truesize += delta_truesize;
283283
p->len += len;
284+
skb_shinfo(p)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
284285
if (lp != p) {
285286
lp->data_len += len;
286287
lp->truesize += delta_truesize;
287288
lp->len += len;
289+
skb_shinfo(lp)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
288290
}
289291
NAPI_GRO_CB(skb)->same_flow = 1;
290292
return 0;

net/core/skbuff.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1798,6 +1798,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom,
17981798
skb_frag_ref(skb, i);
17991799
}
18001800
skb_shinfo(n)->nr_frags = i;
1801+
skb_shinfo(n)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
18011802
}
18021803

18031804
if (skb_has_frag_list(skb)) {
@@ -3789,6 +3790,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
37893790
tgt->ip_summed = CHECKSUM_PARTIAL;
37903791
skb->ip_summed = CHECKSUM_PARTIAL;
37913792

3793+
skb_shinfo(tgt)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
3794+
37923795
skb_len_add(skb, -shiftlen);
37933796
skb_len_add(tgt, shiftlen);
37943797

@@ -4362,7 +4365,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
43624365
skb_copy_from_linear_data_offset(head_skb, offset,
43634366
skb_put(nskb, hsize), hsize);
43644367

4365-
skb_shinfo(nskb)->flags |= skb_shinfo(head_skb)->flags &
4368+
skb_shinfo(nskb)->flags |= (skb_shinfo(head_skb)->flags |
4369+
skb_shinfo(frag_skb)->flags) &
43664370
SKBFL_SHARED_FRAG;
43674371

43684372
if (skb_zerocopy_clone(nskb, frag_skb, GFP_ATOMIC))
@@ -4379,6 +4383,9 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
43794383
nfrags = skb_shinfo(list_skb)->nr_frags;
43804384
frag = skb_shinfo(list_skb)->frags;
43814385
frag_skb = list_skb;
4386+
4387+
skb_shinfo(nskb)->flags |= skb_shinfo(frag_skb)->flags & SKBFL_SHARED_FRAG;
4388+
43824389
if (!skb_headlen(list_skb)) {
43834390
BUG_ON(!nfrags);
43844391
} else {

net/ipv4/udp_offload.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,8 @@ static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)
546546
p->truesize += skb->truesize;
547547
p->len += skb->len;
548548

549+
skb_shinfo(p)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
550+
549551
NAPI_GRO_CB(skb)->same_flow = 1;
550552

551553
return 0;

0 commit comments

Comments
 (0)