Skip to content

Commit 792cf40

Browse files
Gavrilov IliasfX-bot
Gavrilov Ilia
authored andcommitted
drop_monitor: fix incorrect initialization order
[ Upstream commit 07b598c0e6f06a0f254c88dafb4ad50f8a8c6eea ] Syzkaller reports the following bug: BUG: spinlock bad magic on CPU#1, syz-executor.0/7995 lock: 0xffff88805303f3e0, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0 CPU: 1 PID: 7995 Comm: syz-executor.0 Tainted: G E 5.10.209+ #1 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 11/12/2020 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x119/0x179 lib/dump_stack.c:118 debug_spin_lock_before kernel/locking/spinlock_debug.c:83 [inline] do_raw_spin_lock+0x1f6/0x270 kernel/locking/spinlock_debug.c:112 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:117 [inline] _raw_spin_lock_irqsave+0x50/0x70 kernel/locking/spinlock.c:159 reset_per_cpu_data+0xe6/0x240 [drop_monitor] net_dm_cmd_trace+0x43d/0x17a0 [drop_monitor] genl_family_rcv_msg_doit+0x22f/0x330 net/netlink/genetlink.c:739 genl_family_rcv_msg net/netlink/genetlink.c:783 [inline] genl_rcv_msg+0x341/0x5a0 net/netlink/genetlink.c:800 netlink_rcv_skb+0x14d/0x440 net/netlink/af_netlink.c:2497 genl_rcv+0x29/0x40 net/netlink/genetlink.c:811 netlink_unicast_kernel net/netlink/af_netlink.c:1322 [inline] netlink_unicast+0x54b/0x800 net/netlink/af_netlink.c:1348 netlink_sendmsg+0x914/0xe00 net/netlink/af_netlink.c:1916 sock_sendmsg_nosec net/socket.c:651 [inline] __sock_sendmsg+0x157/0x190 net/socket.c:663 ____sys_sendmsg+0x712/0x870 net/socket.c:2378 ___sys_sendmsg+0xf8/0x170 net/socket.c:2432 __sys_sendmsg+0xea/0x1b0 net/socket.c:2461 do_syscall_64+0x30/0x40 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x62/0xc7 RIP: 0033:0x7f3f9815aee9 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f3f972bf0c8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f3f9826d050 RCX: 00007f3f9815aee9 RDX: 0000000020000000 RSI: 0000000020001300 RDI: 0000000000000007 RBP: 00007f3f981b63bd R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000006e R14: 00007f3f9826d050 R15: 00007ffe01ee6768 If drop_monitor is built as a kernel module, syzkaller may have time to send a netlink NET_DM_CMD_START message during the module loading. This will call the net_dm_monitor_start() function that uses a spinlock that has not yet been initialized. To fix this, let's place resource initialization above the registration of a generic netlink family. Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: 9a8afc8 ("Network Drop Monitor: Adding drop monitor implementation & Netlink protocol") Cc: [email protected] Signed-off-by: Ilia Gavrilov <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 4684465 commit 792cf40

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

net/core/drop_monitor.c

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,30 +1725,30 @@ static int __init init_net_drop_monitor(void)
17251725
return -ENOSPC;
17261726
}
17271727

1728-
rc = genl_register_family(&net_drop_monitor_family);
1729-
if (rc) {
1730-
pr_err("Could not create drop monitor netlink family\n");
1731-
return rc;
1728+
for_each_possible_cpu(cpu) {
1729+
net_dm_cpu_data_init(cpu);
1730+
net_dm_hw_cpu_data_init(cpu);
17321731
}
1733-
WARN_ON(net_drop_monitor_family.mcgrp_offset != NET_DM_GRP_ALERT);
17341732

17351733
rc = register_netdevice_notifier(&dropmon_net_notifier);
17361734
if (rc < 0) {
17371735
pr_crit("Failed to register netdevice notifier\n");
1736+
return rc;
1737+
}
1738+
1739+
rc = genl_register_family(&net_drop_monitor_family);
1740+
if (rc) {
1741+
pr_err("Could not create drop monitor netlink family\n");
17381742
goto out_unreg;
17391743
}
1744+
WARN_ON(net_drop_monitor_family.mcgrp_offset != NET_DM_GRP_ALERT);
17401745

17411746
rc = 0;
17421747

1743-
for_each_possible_cpu(cpu) {
1744-
net_dm_cpu_data_init(cpu);
1745-
net_dm_hw_cpu_data_init(cpu);
1746-
}
1747-
17481748
goto out;
17491749

17501750
out_unreg:
1751-
genl_unregister_family(&net_drop_monitor_family);
1751+
WARN_ON(unregister_netdevice_notifier(&dropmon_net_notifier));
17521752
out:
17531753
return rc;
17541754
}
@@ -1757,19 +1757,18 @@ static void exit_net_drop_monitor(void)
17571757
{
17581758
int cpu;
17591759

1760-
BUG_ON(unregister_netdevice_notifier(&dropmon_net_notifier));
1761-
17621760
/*
17631761
* Because of the module_get/put we do in the trace state change path
17641762
* we are guarnateed not to have any current users when we get here
17651763
*/
1764+
BUG_ON(genl_unregister_family(&net_drop_monitor_family));
1765+
1766+
BUG_ON(unregister_netdevice_notifier(&dropmon_net_notifier));
17661767

17671768
for_each_possible_cpu(cpu) {
17681769
net_dm_hw_cpu_data_fini(cpu);
17691770
net_dm_cpu_data_fini(cpu);
17701771
}
1771-
1772-
BUG_ON(genl_unregister_family(&net_drop_monitor_family));
17731772
}
17741773

17751774
module_init(init_net_drop_monitor);

0 commit comments

Comments
 (0)