mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
vxlan: Don't call gro_cells_destroy() before device is unregistered
Commitad6c9986bc
("vxlan: Fix GRO cells race condition between receive and link delete") fixed a race condition for the typical case a vxlan device is dismantled from the current netns. But if a netns is dismantled, vxlan_destroy_tunnels() is called to schedule a unregister_netdevice_queue() of all the vxlan tunnels that are related to this netns. In vxlan_destroy_tunnels(), gro_cells_destroy() is called and finished before unregister_netdevice_queue(). This means that the gro_cells_destroy() call is done too soon, for the same reasons explained in above commit. So we need to fully respect the RCU rules, and thus must remove the gro_cells_destroy() call or risk use after-free. Fixes:58ce31cca1
("vxlan: GRO support at tunnel layer") Signed-off-by: Suanming.Mou <mousuanming@huawei.com> Suggested-by: Eric Dumazet <eric.dumazet@gmail.com> Reviewed-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a7faaa0c5d
commit
cc4807bb60
1 changed files with 1 additions and 3 deletions
|
@ -4335,10 +4335,8 @@ static void vxlan_destroy_tunnels(struct net *net, struct list_head *head)
|
||||||
/* If vxlan->dev is in the same netns, it has already been added
|
/* If vxlan->dev is in the same netns, it has already been added
|
||||||
* to the list by the previous loop.
|
* to the list by the previous loop.
|
||||||
*/
|
*/
|
||||||
if (!net_eq(dev_net(vxlan->dev), net)) {
|
if (!net_eq(dev_net(vxlan->dev), net))
|
||||||
gro_cells_destroy(&vxlan->gro_cells);
|
|
||||||
unregister_netdevice_queue(vxlan->dev, head);
|
unregister_netdevice_queue(vxlan->dev, head);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (h = 0; h < PORT_HASH_SIZE; ++h)
|
for (h = 0; h < PORT_HASH_SIZE; ++h)
|
||||||
|
|
Loading…
Reference in a new issue