diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-09-04 23:12:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-05 20:31:02 +0200 |
| commit | f011baf95e9d3e06e63132c9f8f7307def2e6753 (patch) | |
| tree | 9ca5f077ec2d8563206f1676e6a80206b37d76b2 /drivers/net/vxlan.c | |
| parent | net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls (diff) | |
| download | linux-f011baf95e9d3e06e63132c9f8f7307def2e6753.tar.xz linux-f011baf95e9d3e06e63132c9f8f7307def2e6753.zip | |
vxlan: Fix kernel panic on device delete.
On vxlan device create if socket create fails vxlan device is not
added to hash table. Therefore we need to check if device
is in hashtable before we delete it from hlist.
Following patch avoid the crash. net-next already has this fix.
---8<---
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [<ffffffffa05f9ca7>] vxlan_dellink+0x77/0xf0 [vxlan]
PGD 42b2d9067 PUD 42e04c067 PMD 0
Oops: 0002 [#1] SMP
Modules linked in: vxlan(-)
Hardware name: Dell Inc. PowerEdge R620/0KCKR5, BIOS 1.4.8 10/25/2012
task: ffff88042ecf8760 ti: ffff88042f106000 task.ti: ffff88042f106000
RIP: 0010:[<ffffffffa05f9ca7>] [<ffffffffa05f9ca7>]
vxlan_dellink+0x77/0xf0 [vxlan]
RSP: 0018:ffff88042f107e28 EFLAGS: 00010246
RAX: 0000000000000000 RBX: ffff88082af08000 RCX: ffff88083fd80000
RDX: 0000000000000000 RSI: ffff88042f107e58 RDI: ffff88042e12f810
RBP: ffff88042f107e48 R08: ffffffff8166eca0 R09: 0000000000000000
R10: 0000000000000001 R11: 0000000000000000 R12: ffff88082af087c0
R13: ffff88042e12f000 R14: ffff88042f107e58 R15: ffff88042f107e58
FS: 00007f4ed2de7700(0000) GS:ffff88043fc80000(0000)
knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000000 CR3: 000000042e076000 CR4: 00000000000407e0
Stack:
ffff88082af08000 ffffffff81654848 ffffffffa05fb4e0 ffffffff81654780
ffff88042f107e98 ffffffff813b9c7a ffff88042f107e58 ffff88042f107e58
ffff88042f107e88 ffffffffa05fb4e0 ffffffffa05fb780 ffff88042f107f18
Call Trace:
[<ffffffff813b9c7a>] __rtnl_link_unregister+0xca/0xd0
[<ffffffff813bb0e9>] rtnl_link_unregister+0x19/0x30
[<ffffffffa05faa4c>] vxlan_cleanup_module+0x10/0x2f [vxlan]
[<ffffffff81099fef>] SyS_delete_module+0x1cf/0x2c0
[<ffffffff8146c069>] ? do_page_fault+0x9/0x10
[<ffffffff8146f012>] system_call_fastpath+0x16/0x1b
Code: 4d 85 ed 0f 84 95 00 00 00 4c 8d a7 c0 07 00 00 49 8d bd 10 08 00
00 e8 28 e8 e6 e0 48 8b 83 c0 07 00 00 49 8b 54 24 08 48 85 c0 <48> 89
02 74 04 48 89 50 08 49 b8 00 02 20 00 00 00 ad de 4d 89
RIP [<ffffffffa05f9ca7>] vxlan_dellink+0x77/0xf0 [vxlan]
RSP <ffff88042f107e28>
CR2: 0000000000000000
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/vxlan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 767f7af3bd40..2c15f6c86502 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1794,7 +1794,8 @@ static void vxlan_dellink(struct net_device *dev, struct list_head *head) struct vxlan_dev *vxlan = netdev_priv(dev); spin_lock(&vn->sock_lock); - hlist_del_rcu(&vxlan->hlist); + if (!hlist_unhashed(&vxlan->hlist)) + hlist_del_rcu(&vxlan->hlist); spin_unlock(&vn->sock_lock); list_del(&vxlan->next); |