diff options
| author | Zhiqiang Liu <liuzhiqiang26@huawei.com> | 2019-03-16 17:02:54 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-03 06:26:18 +0200 |
| commit | 979f8a675d3b8f28c80ec23c4e9406ce30464c8e (patch) | |
| tree | 2a74471894b4bee5d7a333635adee64c9ef7d4bd | |
| parent | 3b1386beeef4a355dcf48d5c8d0653ba39887cf6 (diff) | |
| download | linux-stable-979f8a675d3b8f28c80ec23c4e9406ce30464c8e.tar.gz linux-stable-979f8a675d3b8f28c80ec23c4e9406ce30464c8e.tar.bz2 linux-stable-979f8a675d3b8f28c80ec23c4e9406ce30464c8e.zip | |
vxlan: Don't call gro_cells_destroy() before device is unregistered
[ Upstream commit cc4807bb609230d8959fd732b0bf3bd4c2de8eac ]
Commit ad6c9986bcb62 ("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: 58ce31cca1ff ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/vxlan.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 52387f7f12ed..0b1ec44acbf9 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -3798,10 +3798,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 * to the list by the previous loop. */ - if (!net_eq(dev_net(vxlan->dev), net)) { - gro_cells_destroy(&vxlan->gro_cells); + if (!net_eq(dev_net(vxlan->dev), net)) unregister_netdevice_queue(vxlan->dev, head); - } } for (h = 0; h < PORT_HASH_SIZE; ++h) |