Skip to content

Commit 0c06bea

Browse files
Kirill Tkhaidavem330
authored andcommitted
net: Fix possible race in peernet2id_alloc()
peernet2id_alloc() is racy without rtnl_lock() as refcount_read(&peer->count) under net->nsid_lock does not guarantee, peer is alive: rcu_read_lock() peernet2id_alloc() .. spin_lock_bh(&net->nsid_lock) .. refcount_read(&peer->count) (!= 0) .. .. put_net() .. cleanup_net() .. for_each_net(tmp) .. spin_lock_bh(&tmp->nsid_lock) .. __peernet2id(tmp, net) == -1 .. .. .. .. __peernet2id_alloc(alloc == true) .. .. .. rcu_read_unlock() .. .. synchronize_rcu() .. kmem_cache_free(net) After the above situation, net::netns_id contains id pointing to freed memory, and any other dereferencing by the id will operate with this freed memory. Currently, peernet2id_alloc() is used under rtnl_lock() everywhere except ovs_vport_cmd_fill_info(), and this race can't occur. But peernet2id_alloc() is generic interface, and better we fix it before someone really starts use it in wrong context. v2: Don't place refcount_read(&net->count) under net->nsid_lock as suggested by Eric W. Biederman <[email protected]> v3: Rebase on top of net-next Signed-off-by: Kirill Tkhai <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a29ae44 commit 0c06bea

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

net/core/net_namespace.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,26 @@ static void rtnl_net_notifyid(struct net *net, int cmd, int id);
221221
*/
222222
int peernet2id_alloc(struct net *net, struct net *peer)
223223
{
224-
bool alloc;
224+
bool alloc = false, alive = false;
225225
int id;
226226

227227
if (refcount_read(&net->count) == 0)
228228
return NETNSA_NSID_NOT_ASSIGNED;
229229
spin_lock_bh(&net->nsid_lock);
230-
alloc = refcount_read(&peer->count) == 0 ? false : true;
230+
/*
231+
* When peer is obtained from RCU lists, we may race with
232+
* its cleanup. Check whether it's alive, and this guarantees
233+
* we never hash a peer back to net->netns_ids, after it has
234+
* just been idr_remove()'d from there in cleanup_net().
235+
*/
236+
if (maybe_get_net(peer))
237+
alive = alloc = true;
231238
id = __peernet2id_alloc(net, peer, &alloc);
232239
spin_unlock_bh(&net->nsid_lock);
233240
if (alloc && id >= 0)
234241
rtnl_net_notifyid(net, RTM_NEWNSID, id);
242+
if (alive)
243+
put_net(peer);
235244
return id;
236245
}
237246
EXPORT_SYMBOL_GPL(peernet2id_alloc);

0 commit comments

Comments
 (0)