Skip to content

Commit 8836c26

Browse files
Mohamed Khalfellagregkh
authored andcommitted
skbuff: skb_segment, Call zero copy functions before using skbuff frags
commit 2ea3528 upstream. Commit bf5c25d ("skbuff: in skb_segment, call zerocopy functions once per nskb") added the call to zero copy functions in skb_segment(). The change introduced a bug in skb_segment() because skb_orphan_frags() may possibly change the number of fragments or allocate new fragments altogether leaving nrfrags and frag to point to the old values. This can cause a panic with stacktrace like the one below. [ 193.894380] BUG: kernel NULL pointer dereference, address: 00000000000000bc [ 193.895273] CPU: 13 PID: 18164 Comm: vh-net-17428 Kdump: loaded Tainted: G O 5.15.123+ #26 [ 193.903919] RIP: 0010:skb_segment+0xb0e/0x12f0 [ 194.021892] Call Trace: [ 194.027422] <TASK> [ 194.072861] tcp_gso_segment+0x107/0x540 [ 194.082031] inet_gso_segment+0x15c/0x3d0 [ 194.090783] skb_mac_gso_segment+0x9f/0x110 [ 194.095016] __skb_gso_segment+0xc1/0x190 [ 194.103131] netem_enqueue+0x290/0xb10 [sch_netem] [ 194.107071] dev_qdisc_enqueue+0x16/0x70 [ 194.110884] __dev_queue_xmit+0x63b/0xb30 [ 194.121670] bond_start_xmit+0x159/0x380 [bonding] [ 194.128506] dev_hard_start_xmit+0xc3/0x1e0 [ 194.131787] __dev_queue_xmit+0x8a0/0xb30 [ 194.138225] macvlan_start_xmit+0x4f/0x100 [macvlan] [ 194.141477] dev_hard_start_xmit+0xc3/0x1e0 [ 194.144622] sch_direct_xmit+0xe3/0x280 [ 194.147748] __dev_queue_xmit+0x54a/0xb30 [ 194.154131] tap_get_user+0x2a8/0x9c0 [tap] [ 194.157358] tap_sendmsg+0x52/0x8e0 [tap] [ 194.167049] handle_tx_zerocopy+0x14e/0x4c0 [vhost_net] [ 194.173631] handle_tx+0xcd/0xe0 [vhost_net] [ 194.176959] vhost_worker+0x76/0xb0 [vhost] [ 194.183667] kthread+0x118/0x140 [ 194.190358] ret_from_fork+0x1f/0x30 [ 194.193670] </TASK> In this case calling skb_orphan_frags() updated nr_frags leaving nrfrags local variable in skb_segment() stale. This resulted in the code hitting i >= nrfrags prematurely and trying to move to next frag_skb using list_skb pointer, which was NULL, and caused kernel panic. Move the call to zero copy functions before using frags and nr_frags. Fixes: bf5c25d ("skbuff: in skb_segment, call zerocopy functions once per nskb") Signed-off-by: Mohamed Khalfella <[email protected]> Reported-by: Amit Goyal <[email protected]> Cc: [email protected] Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5541827 commit 8836c26

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

net/core/skbuff.c

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3799,21 +3799,20 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
37993799
struct sk_buff *segs = NULL;
38003800
struct sk_buff *tail = NULL;
38013801
struct sk_buff *list_skb = skb_shinfo(head_skb)->frag_list;
3802-
skb_frag_t *frag = skb_shinfo(head_skb)->frags;
38033802
unsigned int mss = skb_shinfo(head_skb)->gso_size;
38043803
unsigned int doffset = head_skb->data - skb_mac_header(head_skb);
3805-
struct sk_buff *frag_skb = head_skb;
38063804
unsigned int offset = doffset;
38073805
unsigned int tnl_hlen = skb_tnl_header_len(head_skb);
38083806
unsigned int partial_segs = 0;
38093807
unsigned int headroom;
38103808
unsigned int len = head_skb->len;
3809+
struct sk_buff *frag_skb;
3810+
skb_frag_t *frag;
38113811
__be16 proto;
38123812
bool csum, sg;
3813-
int nfrags = skb_shinfo(head_skb)->nr_frags;
38143813
int err = -ENOMEM;
38153814
int i = 0;
3816-
int pos;
3815+
int nfrags, pos;
38173816

38183817
if ((skb_shinfo(head_skb)->gso_type & SKB_GSO_DODGY) &&
38193818
mss != GSO_BY_FRAGS && mss != skb_headlen(head_skb)) {
@@ -3890,6 +3889,13 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
38903889
headroom = skb_headroom(head_skb);
38913890
pos = skb_headlen(head_skb);
38923891

3892+
if (skb_orphan_frags(head_skb, GFP_ATOMIC))
3893+
return ERR_PTR(-ENOMEM);
3894+
3895+
nfrags = skb_shinfo(head_skb)->nr_frags;
3896+
frag = skb_shinfo(head_skb)->frags;
3897+
frag_skb = head_skb;
3898+
38933899
do {
38943900
struct sk_buff *nskb;
38953901
skb_frag_t *nskb_frag;
@@ -3914,6 +3920,10 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
39143920
(skb_headlen(list_skb) == len || sg)) {
39153921
BUG_ON(skb_headlen(list_skb) > len);
39163922

3923+
nskb = skb_clone(list_skb, GFP_ATOMIC);
3924+
if (unlikely(!nskb))
3925+
goto err;
3926+
39173927
i = 0;
39183928
nfrags = skb_shinfo(list_skb)->nr_frags;
39193929
frag = skb_shinfo(list_skb)->frags;
@@ -3932,12 +3942,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
39323942
frag++;
39333943
}
39343944

3935-
nskb = skb_clone(list_skb, GFP_ATOMIC);
39363945
list_skb = list_skb->next;
39373946

3938-
if (unlikely(!nskb))
3939-
goto err;
3940-
39413947
if (unlikely(pskb_trim(nskb, len))) {
39423948
kfree_skb(nskb);
39433949
goto err;
@@ -4008,12 +4014,16 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
40084014
skb_shinfo(nskb)->tx_flags |= skb_shinfo(head_skb)->tx_flags &
40094015
SKBTX_SHARED_FRAG;
40104016

4011-
if (skb_orphan_frags(frag_skb, GFP_ATOMIC) ||
4012-
skb_zerocopy_clone(nskb, frag_skb, GFP_ATOMIC))
4017+
if (skb_zerocopy_clone(nskb, frag_skb, GFP_ATOMIC))
40134018
goto err;
40144019

40154020
while (pos < offset + len) {
40164021
if (i >= nfrags) {
4022+
if (skb_orphan_frags(list_skb, GFP_ATOMIC) ||
4023+
skb_zerocopy_clone(nskb, list_skb,
4024+
GFP_ATOMIC))
4025+
goto err;
4026+
40174027
i = 0;
40184028
nfrags = skb_shinfo(list_skb)->nr_frags;
40194029
frag = skb_shinfo(list_skb)->frags;
@@ -4027,10 +4037,6 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
40274037
i--;
40284038
frag--;
40294039
}
4030-
if (skb_orphan_frags(frag_skb, GFP_ATOMIC) ||
4031-
skb_zerocopy_clone(nskb, frag_skb,
4032-
GFP_ATOMIC))
4033-
goto err;
40344040

40354041
list_skb = list_skb->next;
40364042
}

0 commit comments

Comments
 (0)