net: Fix double free and memory corruption in get_net_ns_by_id()
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 net: Fix double free and memory corruption in get_net_ns_by_id()
(I can trivially verify that that idr_remove in cleanup_net happens
after the network namespace count has dropped to zero --EWB)
Function get_net_ns_by_id() does not check for net::count after it has found a peer in netns_ids idr.
It may dereference a peer, after its count has already been finaly decremented. This leads to double free and memory corruption:
put_net(peer) rtnl_lock()
atomic_dec_and_test(&peer->count) [count=0] ...
__put_net(peer) get_net_ns_by_id(net, id)
spin_lock(&cleanup_list_lock)
list_add(&net->cleanup_list, &cleanup_list)
spin_unlock(&cleanup_list_lock)
queue_work() peer = idr_find(&net->netns_ids, id)
| get_net(peer) [count=1]
| ...
| (use after final put)
v ...
cleanup_net() ...
spin_lock(&cleanup_list_lock) ...
list_replace_init(&cleanup_list, ..) ...
spin_unlock(&cleanup_list_lock) ...
... ...
... put_net(peer)
... atomic_dec_and_test(&peer->count) [count=0]
... spin_lock(&cleanup_list_lock)
... list_add(&net->cleanup_list, &cleanup_list)
... spin_unlock(&cleanup_list_lock)
... queue_work()
... rtnl_unlock()
rtnl_lock() ...
for_each_net(tmp) { ...
id = __peernet2id(tmp, peer) ...
spin_lock_irq(&tmp->nsid_lock) ...
idr_remove(&tmp->netns_ids, id) ...
... ...
net_drop_ns() ...
net_free(peer) ...
} ... |
v
cleanup_net()
...
(Second free of peer)
Also, put_net() on the right cpu may reorder with left's cpu list_replace_init(&cleanup_list, ..), and then cleanup_list will be corrupted.
Since cleanup_net() is executed in worker thread, while put_net(peer) can happen everywhere, there should be enough time for concurrent get_net_ns_by_id() to pick the peer up, and the race does not seem to be unlikely. The patch fixes the problem in standard way.
(Also, there is possible problem in peernet2id_alloc(), which requires check for net::count under nsid_lock and maybe_get_net(peer), but in current stable kernel it's used under rtnl_lock() and it has to be safe. Openswitch begun to use peernet2id_alloc(), and possibly it should be fixed too. While this is not in stable kernel yet, so I'll send a separate message to netdev@ later).
--- net/core/net_namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/net_namespace.c +1 -1
@@ -267,7 +267,7 @@ struct net *get_net_ns_by_id(struct net *net, int id)spin_lock_bh (&net->nsid_lock); peer =idr_find (&net->netns_ids, id);if (peer) -get_net (peer); + peer =maybe_get_net (peer);spin_unlock_bh (&net->nsid_lock);rcu_read_unlock ();
Signature · 1 line
2.14.1
Quoted 3 lines · Eric W. Biederman
(I can trivially verify that that
idr_removeincleanup_nethappens
after the network namespace count has dropped to zero --EWB)
Thanks !
Le 19/12/2017 à 18:27, Eric W. Biederman a écrit :
Quoted 66 lines
(I can trivially verify that that
idr_removeincleanup_nethappens
after the network namespace count has dropped to zero --EWB)Function
get_net_ns_by_id()does not check fornet::countafter it has found a peer innetns_idsidr.It may dereference a peer, after its count has already been finaly decremented. This leads to double free and memory corruption:
put_net(peer) rtnl_lock() atomic_dec_and_test(&peer->count) [count=0] ... __put_net(peer) get_net_ns_by_id(net, id) spin_lock(&cleanup_list_lock) list_add(&net->cleanup_list, &cleanup_list) spin_unlock(&cleanup_list_lock) queue_work() peer = idr_find(&net->netns_ids, id) | get_net(peer) [count=1] | ... | (use after final put) v ... cleanup_net() ... spin_lock(&cleanup_list_lock) ... list_replace_init(&cleanup_list, ..) ... spin_unlock(&cleanup_list_lock) ... ... ... ... put_net(peer) ... atomic_dec_and_test(&peer->count) [count=0] ... spin_lock(&cleanup_list_lock) ... list_add(&net->cleanup_list, &cleanup_list) ... spin_unlock(&cleanup_list_lock) ... queue_work() ... rtnl_unlock() rtnl_lock() ... for_each_net(tmp) { ... id = __peernet2id(tmp, peer) ... spin_lock_irq(&tmp->nsid_lock) ... idr_remove(&tmp->netns_ids, id) ... ... ... net_drop_ns() ... net_free(peer) ... } ...|
v
cleanup_net()
...
(Second free of peer)Also,
put_net()on the right cpu may reorder with left's cpulist_replace_init(&cleanup_list, ..), and thencleanup_listwill be corrupted.Since
cleanup_net()is executed in worker thread, whileput_net(peer)can happen everywhere, there should be enough time for concurrentget_net_ns_by_id()to pick the peer up, and the race does not seem to be unlikely. The patch fixes the problem in standard way.(Also, there is possible problem in
peernet2id_alloc(), which requires check fornet::countundernsid_lockandmaybe_get_net(peer), but in current stable kernel it's used underrtnl_lock()and it has to be safe. Openswitch begun to usepeernet2id_alloc(), and possibly it should be fixed too. While this is not in stable kernel yet, so I'll send a separate message to netdev@ later).
Quoted 6 lines
Cc Nicolas Dichtel <[email protected]>Signed-off-by Kirill Tkhai <[email protected]>Fixes 0c7aecd4bde4 "netns: add rtnl cmd to add and get peer netns ids"Reviewed-by Andrey Ryabinin <[email protected]>Reviewed-by "Eric W. Biederman" <[email protected]>Signed-off-by Eric W. Biederman <[email protected]>
Good catch, thank you.
David Miller
maintainerFrom: [email protected] (Eric W. Biederman)
Date: Tue, 19 Dec 2017 11:27:56 -0600
Quoted 9 lines
(I can trivially verify that that
idr_removeincleanup_nethappens
after the network namespace count has dropped to zero --EWB)Function
get_net_ns_by_id()does not check fornet::countafter it has found a peer innetns_idsidr.It may dereference a peer, after its count has already been finaly decremented. This leads to double free and memory corruption:
...
Quoted 17 lines
Also,
put_net()on the right cpu may reorder with left's cpulist_replace_init(&cleanup_list, ..), and thencleanup_listwill be corrupted.Since
cleanup_net()is executed in worker thread, whileput_net(peer)can happen everywhere, there should be enough time for concurrentget_net_ns_by_id()to pick the peer up, and the race does not seem to be unlikely. The patch fixes the problem in standard way.(Also, there is possible problem in
peernet2id_alloc(), which requires check fornet::countundernsid_lockandmaybe_get_net(peer), but in current stable kernel it's used underrtnl_lock()and it has to be safe. Openswitch begun to usepeernet2id_alloc(), and possibly it should be fixed too. While this is not in stable kernel yet, so I'll send a separate message to netdev@ later).
Quoted 6 lines
Cc Nicolas Dichtel <[email protected]>Signed-off-by Kirill Tkhai <[email protected]>Fixes 0c7aecd4bde4 "netns: add rtnl cmd to add and get peer netns ids"Reviewed-by Andrey Ryabinin <[email protected]>Reviewed-by "Eric W. Biederman" <[email protected]>Signed-off-by Eric W. Biederman <[email protected]>
Applied and queued up for -stable, thanks.