Skip to content

Commit ee01b2f

Browse files
atenartkuba-moo
authored andcommitted
net: gso: fix ownership in __udp_gso_segment
In __udp_gso_segment the skb destructor is removed before segmenting the skb but the socket reference is kept as-is. This is an issue if the original skb is later orphaned as we can hit the following bug: kernel BUG at ./include/linux/skbuff.h:3312! (skb_orphan) RIP: 0010:ip_rcv_core+0x8b2/0xca0 Call Trace: ip_rcv+0xab/0x6e0 __netif_receive_skb_one_core+0x168/0x1b0 process_backlog+0x384/0x1100 __napi_poll.constprop.0+0xa1/0x370 net_rx_action+0x925/0xe50 The above can happen following a sequence of events when using OpenVSwitch, when an OVS_ACTION_ATTR_USERSPACE action precedes an OVS_ACTION_ATTR_OUTPUT action: 1. OVS_ACTION_ATTR_USERSPACE is handled (in do_execute_actions): the skb goes through queue_gso_packets and then __udp_gso_segment, where its destructor is removed. 2. The segments' data are copied and sent to userspace. 3. OVS_ACTION_ATTR_OUTPUT is handled (in do_execute_actions) and the same original skb is sent to its path. 4. If it later hits skb_orphan, we hit the bug. Fix this by also removing the reference to the socket in __udp_gso_segment. Fixes: ad40585 ("udp: better wmem accounting on gso") Signed-off-by: Antoine Tenart <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 0fd7b2a commit ee01b2f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

net/ipv4/udp_offload.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,17 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
321321

322322
/* clear destructor to avoid skb_segment assigning it to tail */
323323
copy_dtor = gso_skb->destructor == sock_wfree;
324-
if (copy_dtor)
324+
if (copy_dtor) {
325325
gso_skb->destructor = NULL;
326+
gso_skb->sk = NULL;
327+
}
326328

327329
segs = skb_segment(gso_skb, features);
328330
if (IS_ERR_OR_NULL(segs)) {
329-
if (copy_dtor)
331+
if (copy_dtor) {
330332
gso_skb->destructor = sock_wfree;
333+
gso_skb->sk = sk;
334+
}
331335
return segs;
332336
}
333337

0 commit comments

Comments
 (0)