Revert "genetlink: fix family dump race"
This reverts commit 58ad436fcf
.
It turns out that the change introduced a potential deadlock
by causing a locking dependency with netlink's cb_mutex. I
can't seem to find a way to resolve this without doing major
changes to the locking, so revert this.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e75dc677ff
commit
9d47b38056
|
@ -789,10 +789,6 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
struct net *net = sock_net(skb->sk);
|
struct net *net = sock_net(skb->sk);
|
||||||
int chains_to_skip = cb->args[0];
|
int chains_to_skip = cb->args[0];
|
||||||
int fams_to_skip = cb->args[1];
|
int fams_to_skip = cb->args[1];
|
||||||
bool need_locking = chains_to_skip || fams_to_skip;
|
|
||||||
|
|
||||||
if (need_locking)
|
|
||||||
genl_lock();
|
|
||||||
|
|
||||||
for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
|
for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
|
||||||
n = 0;
|
n = 0;
|
||||||
|
@ -814,9 +810,6 @@ errout:
|
||||||
cb->args[0] = i;
|
cb->args[0] = i;
|
||||||
cb->args[1] = n;
|
cb->args[1] = n;
|
||||||
|
|
||||||
if (need_locking)
|
|
||||||
genl_unlock();
|
|
||||||
|
|
||||||
return skb->len;
|
return skb->len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue