Skip to content

Commit bdeb026

Browse files
Nikolay Aleksandrovgregkh
Nikolay Aleksandrov
authored andcommitted
ip6mr: fix notification device destruction
[ Upstream commit 723b929 ] Andrey Konovalov reported a BUG caused by the ip6mr code which is caused because we call unregister_netdevice_many for a device that is already being destroyed. In IPv4's ipmr that has been resolved by two commits long time ago by introducing the "notify" parameter to the delete function and avoiding the unregister when called from a notifier, so let's do the same for ip6mr. The trace from Andrey: ------------[ cut here ]------------ kernel BUG at net/core/dev.c:6813! invalid opcode: 0000 [hardkernel#1] SMP KASAN Modules linked in: CPU: 1 PID: 1165 Comm: kworker/u4:3 Not tainted 4.11.0-rc7+ hardkernel#251 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Workqueue: netns cleanup_net task: ffff880069208000 task.stack: ffff8800692d8000 RIP: 0010:rollback_registered_many+0x348/0xeb0 net/core/dev.c:6813 RSP: 0018:ffff8800692de7f0 EFLAGS: 00010297 RAX: ffff880069208000 RBX: 0000000000000002 RCX: 0000000000000001 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88006af90569 RBP: ffff8800692de9f0 R08: ffff8800692dec60 R09: 0000000000000000 R10: 0000000000000006 R11: 0000000000000000 R12: ffff88006af90070 R13: ffff8800692debf0 R14: dffffc0000000000 R15: ffff88006af90000 FS: 0000000000000000(0000) GS:ffff88006cb00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fe7e897d870 CR3: 00000000657e7000 CR4: 00000000000006e0 Call Trace: unregister_netdevice_many.part.105+0x87/0x440 net/core/dev.c:7881 unregister_netdevice_many+0xc8/0x120 net/core/dev.c:7880 ip6mr_device_event+0x362/0x3f0 net/ipv6/ip6mr.c:1346 notifier_call_chain+0x145/0x2f0 kernel/notifier.c:93 __raw_notifier_call_chain kernel/notifier.c:394 raw_notifier_call_chain+0x2d/0x40 kernel/notifier.c:401 call_netdevice_notifiers_info+0x51/0x90 net/core/dev.c:1647 call_netdevice_notifiers net/core/dev.c:1663 rollback_registered_many+0x919/0xeb0 net/core/dev.c:6841 unregister_netdevice_many.part.105+0x87/0x440 net/core/dev.c:7881 unregister_netdevice_many net/core/dev.c:7880 default_device_exit_batch+0x4fa/0x640 net/core/dev.c:8333 ops_exit_list.isra.4+0x100/0x150 net/core/net_namespace.c:144 cleanup_net+0x5a8/0xb40 net/core/net_namespace.c:463 process_one_work+0xc04/0x1c10 kernel/workqueue.c:2097 worker_thread+0x223/0x19c0 kernel/workqueue.c:2231 kthread+0x35e/0x430 kernel/kthread.c:231 ret_from_fork+0x31/0x40 arch/x86/entry/entry_64.S:430 Code: 3c 32 00 0f 85 70 0b 00 00 48 b8 00 02 00 00 00 00 ad de 49 89 47 78 e9 93 fe ff ff 49 8d 57 70 49 8d 5f 78 eb 9e e8 88 7a 14 fe <0f> 0b 48 8b 9d 28 fe ff ff e8 7a 7a 14 fe 48 b8 00 00 00 00 00 RIP: rollback_registered_many+0x348/0xeb0 RSP: ffff8800692de7f0 ---[ end trace e0b29c57e9b3292c ]--- Reported-by: Andrey Konovalov <[email protected]> Signed-off-by: Nikolay Aleksandrov <[email protected]> Tested-by: Andrey Konovalov <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 25c1040 commit bdeb026

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

net/ipv6/ip6mr.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,8 @@ static struct net_device *ip6mr_reg_vif(struct net *net, struct mr6_table *mrt)
774774
* Delete a VIF entry
775775
*/
776776

777-
static int mif6_delete(struct mr6_table *mrt, int vifi, struct list_head *head)
777+
static int mif6_delete(struct mr6_table *mrt, int vifi, int notify,
778+
struct list_head *head)
778779
{
779780
struct mif_device *v;
780781
struct net_device *dev;
@@ -820,7 +821,7 @@ static int mif6_delete(struct mr6_table *mrt, int vifi, struct list_head *head)
820821
dev->ifindex, &in6_dev->cnf);
821822
}
822823

823-
if (v->flags & MIFF_REGISTER)
824+
if ((v->flags & MIFF_REGISTER) && !notify)
824825
unregister_netdevice_queue(dev, head);
825826

826827
dev_put(dev);
@@ -1330,7 +1331,6 @@ static int ip6mr_device_event(struct notifier_block *this,
13301331
struct mr6_table *mrt;
13311332
struct mif_device *v;
13321333
int ct;
1333-
LIST_HEAD(list);
13341334

13351335
if (event != NETDEV_UNREGISTER)
13361336
return NOTIFY_DONE;
@@ -1339,10 +1339,9 @@ static int ip6mr_device_event(struct notifier_block *this,
13391339
v = &mrt->vif6_table[0];
13401340
for (ct = 0; ct < mrt->maxvif; ct++, v++) {
13411341
if (v->dev == dev)
1342-
mif6_delete(mrt, ct, &list);
1342+
mif6_delete(mrt, ct, 1, NULL);
13431343
}
13441344
}
1345-
unregister_netdevice_many(&list);
13461345

13471346
return NOTIFY_DONE;
13481347
}
@@ -1551,7 +1550,7 @@ static void mroute_clean_tables(struct mr6_table *mrt, bool all)
15511550
for (i = 0; i < mrt->maxvif; i++) {
15521551
if (!all && (mrt->vif6_table[i].flags & VIFF_STATIC))
15531552
continue;
1554-
mif6_delete(mrt, i, &list);
1553+
mif6_delete(mrt, i, 0, &list);
15551554
}
15561555
unregister_netdevice_many(&list);
15571556

@@ -1704,7 +1703,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns
17041703
if (copy_from_user(&mifi, optval, sizeof(mifi_t)))
17051704
return -EFAULT;
17061705
rtnl_lock();
1707-
ret = mif6_delete(mrt, mifi, NULL);
1706+
ret = mif6_delete(mrt, mifi, 0, NULL);
17081707
rtnl_unlock();
17091708
return ret;
17101709

0 commit comments

Comments
 (0)