Skip to content

Commit fc6eb39

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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 760e1ad commit fc6eb39

3 files changed

Lines changed: 13 additions & 1 deletion

File tree

net/core/gro.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,12 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
214214
p->data_len += len;
215215
p->truesize += delta_truesize;
216216
p->len += len;
217+
skb_shinfo(p)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
217218
if (lp != p) {
218219
lp->data_len += len;
219220
lp->truesize += delta_truesize;
220221
lp->len += len;
222+
skb_shinfo(lp)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG;
221223
}
222224
NAPI_GRO_CB(skb)->same_flow = 1;
223225
return 0;
@@ -245,6 +247,8 @@ int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)
245247
p->truesize += skb->truesize;
246248
p->len += skb->len;
247249

250+
skb_shinfo(p)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
251+
248252
NAPI_GRO_CB(skb)->same_flow = 1;
249253

250254
return 0;

net/core/skbuff.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2214,6 +2214,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom,
22142214
skb_frag_ref(skb, i);
22152215
}
22162216
skb_shinfo(n)->nr_frags = i;
2217+
skb_shinfo(n)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
22172218
}
22182219

22192220
if (skb_has_frag_list(skb)) {
@@ -4289,6 +4290,8 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
42894290
tgt->ip_summed = CHECKSUM_PARTIAL;
42904291
skb->ip_summed = CHECKSUM_PARTIAL;
42914292

4293+
skb_shinfo(tgt)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
4294+
42924295
skb_len_add(skb, -shiftlen);
42934296
skb_len_add(tgt, shiftlen);
42944297

@@ -4899,7 +4902,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
48994902
skb_copy_from_linear_data_offset(head_skb, offset,
49004903
skb_put(nskb, hsize), hsize);
49014904

4902-
skb_shinfo(nskb)->flags |= skb_shinfo(head_skb)->flags &
4905+
skb_shinfo(nskb)->flags |= (skb_shinfo(head_skb)->flags |
4906+
skb_shinfo(frag_skb)->flags) &
49034907
SKBFL_SHARED_FRAG;
49044908

49054909
if (skb_zerocopy_clone(nskb, frag_skb, GFP_ATOMIC))
@@ -4916,6 +4920,9 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
49164920
nfrags = skb_shinfo(list_skb)->nr_frags;
49174921
frag = skb_shinfo(list_skb)->frags;
49184922
frag_skb = list_skb;
4923+
4924+
skb_shinfo(nskb)->flags |= skb_shinfo(frag_skb)->flags & SKBFL_SHARED_FRAG;
4925+
49194926
if (!skb_headlen(list_skb)) {
49204927
BUG_ON(!nfrags);
49214928
} else {

net/ipv4/tcp_output.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2391,6 +2391,7 @@ static int tcp_clone_payload(struct sock *sk, struct sk_buff *to,
23912391
todo = min_t(int, skb_frag_size(fragfrom),
23922392
probe_size - len);
23932393
len += todo;
2394+
skb_shinfo(to)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG;
23942395
if (lastfrag &&
23952396
skb_frag_page(fragfrom) == skb_frag_page(lastfrag) &&
23962397
skb_frag_off(fragfrom) == skb_frag_off(lastfrag) +

0 commit comments

Comments
 (0)