Skip to content

Commit 2781e90

Browse files
edumazetopsiff
authored andcommitted
mptcp: fix race in mptcp_pm_nl_flush_addrs_doit()
commit e2a9eeb upstream. syzbot and Eulgyu Kim reported crashes in mptcp_pm_nl_get_local_id() and/or mptcp_pm_nl_is_backup() Root cause is list_splice_init() in mptcp_pm_nl_flush_addrs_doit() which is not RCU ready. list_splice_init_rcu() can not be called here while holding pernet->lock spinlock. Many thanks to Eulgyu Kim for providing a repro and testing our patches. Fixes: 141694d ("mptcp: remove address when netlink flushes addrs") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: syzbot+5498a510ff9de39d37da@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/6970a46d.a00a0220.3ad28e.5cf0.GAE@google.com/T/ Reported-by: Eulgyu Kim <eulgyukim@snu.ac.kr> Closes: multipath-tcp/mptcp_net-next#611 Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20260124-net-mptcp-race_nl_flush_addrs-v3-1-b2dc1b613e9d@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> [ Conflicts because the code has been moved from pm_netlink.c to pm_kernel.c later on in commit 8617e85 ("mptcp: pm: split in-kernel PM specific code"). The same modifications can be applied in pm_netlink.c with one exception, because 'pernet->local_addr_list' has been renamed to 'pernet->endp_list' in commit 35e71e4 ("mptcp: pm: in-kernel: rename 'local_addr_list' to 'endp_list'"). The previous name is then still being used in this version. Also, another conflict is caused by commit 7bcf4d8 ("mptcp: pm: rename helpers linked to 'flush'") which is not in this version: mptcp_nl_remove_addrs_list() has been renamed to mptcp_nl_flush_addrs_list(). The previous name has then been kept. ] Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 455e882192c9833f176f3fbbbb2f036b6c5bf555) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 0074c7c commit 2781e90

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

net/mptcp/pm_netlink.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,16 +1859,26 @@ static void __reset_counters(struct pm_nl_pernet *pernet)
18591859
static int mptcp_nl_cmd_flush_addrs(struct sk_buff *skb, struct genl_info *info)
18601860
{
18611861
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
1862-
LIST_HEAD(free_list);
1862+
struct list_head free_list;
18631863

18641864
spin_lock_bh(&pernet->lock);
1865-
list_splice_init(&pernet->local_addr_list, &free_list);
1865+
free_list = pernet->local_addr_list;
1866+
INIT_LIST_HEAD_RCU(&pernet->local_addr_list);
18661867
__reset_counters(pernet);
18671868
pernet->next_id = 1;
18681869
bitmap_zero(pernet->id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
18691870
spin_unlock_bh(&pernet->lock);
1870-
mptcp_nl_remove_addrs_list(sock_net(skb->sk), &free_list);
1871+
1872+
if (free_list.next == &pernet->local_addr_list)
1873+
return 0;
1874+
18711875
synchronize_rcu();
1876+
1877+
/* Adjust the pointers to free_list instead of pernet->local_addr_list */
1878+
free_list.prev->next = &free_list;
1879+
free_list.next->prev = &free_list;
1880+
1881+
mptcp_nl_remove_addrs_list(sock_net(skb->sk), &free_list);
18721882
__flush_addrs(&free_list);
18731883
return 0;
18741884
}

0 commit comments

Comments
 (0)