Skip to content

Commit 271cd2c

Browse files
ea1davisintel-lab-lkp
authored andcommitted
mptcp: pm: Fix uaf in __timer_delete_sync
There are two paths to access mptcp_pm_del_add_timer, result in a race condition: CPU1 CPU2 ==== ==== net_rx_action napi_poll netlink_sendmsg __napi_poll netlink_unicast process_backlog netlink_unicast_kernel __netif_receive_skb genl_rcv __netif_receive_skb_one_core netlink_rcv_skb NF_HOOK genl_rcv_msg ip_local_deliver_finish genl_family_rcv_msg ip_protocol_deliver_rcu genl_family_rcv_msg_doit tcp_v4_rcv mptcp_pm_nl_flush_addrs_doit tcp_v4_do_rcv mptcp_nl_remove_addrs_list tcp_rcv_established mptcp_pm_remove_addrs_and_subflows tcp_data_queue remove_anno_list_by_saddr mptcp_incoming_options mptcp_pm_del_add_timer mptcp_pm_del_add_timer kfree(entry) In remove_anno_list_by_saddr(running on CPU2), after leaving the critical zone protected by "pm.lock", the entry will be released, which leads to the occurrence of uaf in the mptcp_pm_del_add_timer(running on CPU1). Reported-and-tested-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=f3a31fb909db9b2a5c4d Signed-off-by: Edward Adam Davis <[email protected]>
1 parent 680eef4 commit 271cd2c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

net/mptcp/pm_netlink.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,12 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,
343343
entry = mptcp_lookup_anno_list_by_saddr(msk, addr);
344344
if (entry && (!check_id || entry->addr.id == addr->id))
345345
entry->retrans_times = ADD_ADDR_RETRANS_MAX;
346-
spin_unlock_bh(&msk->pm.lock);
347346

348347
if (entry && (!check_id || entry->addr.id == addr->id))
349348
sk_stop_timer_sync(sk, &entry->add_timer);
350349

350+
spin_unlock_bh(&msk->pm.lock);
351+
351352
return entry;
352353
}
353354

0 commit comments

Comments
 (0)