]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - net/core/rtnetlink.c
net: hold rtnl again in dump callbacks
authorEric Dumazet <eric.dumazet@gmail.com>
Wed, 25 May 2011 07:34:04 +0000 (07:34 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 May 2011 21:55:32 +0000 (17:55 -0400)
commit2907c35ff64708065e5a7fd54e8ded8263eb3074
treeb5046b08b0b4b13c45a2fffef4ad3218c9db07d8
parent1dcb14d9e874d12bab9ceeba776b742f1682b0a6
net: hold rtnl again in dump callbacks

Commit e67f88dd12f6 (dont hold rtnl mutex during netlink dump callbacks)
missed fact that rtnl_fill_ifinfo() must be called with rtnl held.

Because of possible deadlocks between two mutexes (cb_mutex and rtnl),
its not easy to solve this problem, so revert this part of the patch.

It also forgot one rcu_read_unlock() in FIB dump_rules()

Add one ASSERT_RTNL() in rtnl_fill_ifinfo() to remind us the rule.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Patrick McHardy <kaber@trash.net>
CC: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/fib_rules.c
net/core/rtnetlink.c