Skip to content

Commit 0b352f8

Browse files
ffmanceraklassert
authored andcommitted
xfrm: iptfs: fix skb_put() panic on non-linear skb during reassembly
In iptfs_reassem_cont(), IP-TFS attempts to append data to the new inner packet 'newskb' that is being reassembled. First a zero-copy approach is tried if it succeeds then newskb becomes non-linear. When a subsequent fragment in the same datagram does not meet the fast-path conditions, a memory copy is performed. It calls skb_put() to append the data and as newskb is non-linear it triggers SKB_LINEAR_ASSERT check. Oops: invalid opcode: 0000 [#1] SMP NOPTI [...] RIP: 0010:skb_put+0x3c/0x40 [...] Call Trace: <IRQ> iptfs_reassem_cont+0x1ab/0x5e0 [xfrm_iptfs] iptfs_input_ordered+0x2af/0x380 [xfrm_iptfs] iptfs_input+0x122/0x3e0 [xfrm_iptfs] xfrm_input+0x91e/0x1a50 xfrm4_esp_rcv+0x3a/0x110 ip_protocol_deliver_rcu+0x1d7/0x1f0 ip_local_deliver_finish+0xbe/0x1e0 __netif_receive_skb_core.constprop.0+0xb56/0x1120 __netif_receive_skb_list_core+0x133/0x2b0 netif_receive_skb_list_internal+0x1ff/0x3f0 napi_complete_done+0x81/0x220 virtnet_poll+0x9d6/0x116e [virtio_net] __napi_poll.constprop.0+0x2b/0x270 net_rx_action+0x162/0x360 handle_softirqs+0xdc/0x510 __irq_exit_rcu+0xe7/0x110 irq_exit_rcu+0xe/0x20 common_interrupt+0x85/0xa0 </IRQ> <TASK> Fix this by checking if the skb is non-linear. If it is, linearize it by calling skb_linearize(). As the initial allocation of newskb originally reserved enough tailroom for the entire reassembled packet we do not need to check if we have enough tailroom or extend it. Fixes: 5f2b6a9 ("xfrm: iptfs: add skb-fragment sharing code") Reported-by: Hao Long <[email protected]> Closes: https://lore.kernel.org/netdev/[email protected]/ Signed-off-by: Fernando Fernandez Mancera <[email protected]> Signed-off-by: Steffen Klassert <[email protected]>
1 parent 0d10393 commit 0b352f8

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

net/xfrm/xfrm_iptfs.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,12 @@ static u32 iptfs_reassem_cont(struct xfrm_iptfs_data *xtfs, u64 seq,
901901
iptfs_skb_can_add_frags(newskb, fragwalk, data, copylen)) {
902902
iptfs_skb_add_frags(newskb, fragwalk, data, copylen);
903903
} else {
904+
if (skb_linearize(newskb)) {
905+
XFRM_INC_STATS(xs_net(xtfs->x),
906+
LINUX_MIB_XFRMINBUFFERERROR);
907+
goto abandon;
908+
}
909+
904910
/* copy fragment data into newskb */
905911
if (skb_copy_seq_read(st, data, skb_put(newskb, copylen),
906912
copylen)) {

0 commit comments

Comments
 (0)