diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-20 15:32:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-20 15:32:57 -0700 |
| commit | 8e7430857af5b242c950d3d2bb00289374f1436a (patch) | |
| tree | 7488faf98210b8702f0150e969afc192b9c1a223 | |
| parent | 6f5405942321c322f1ba83960837b63a8ebb039e (diff) | |
| download | linux-3.10-8e7430857af5b242c950d3d2bb00289374f1436a.tar.gz linux-3.10-8e7430857af5b242c950d3d2bb00289374f1436a.tar.bz2 linux-3.10-8e7430857af5b242c950d3d2bb00289374f1436a.zip | |
Revert "genetlink: fix family dump race"
This reverts commit aab4f8d490ef8c184d854d5f630438c10406765c, commit
58ad436fcf49810aa006016107f494c9ac9013db upstream, as it causes
problems.
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/netlink/genetlink.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index ba6e55d1ca4..1076fe16b12 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -789,10 +789,6 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb) struct net *net = sock_net(skb->sk); int chains_to_skip = cb->args[0]; 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++) { n = 0; @@ -814,9 +810,6 @@ errout: cb->args[0] = i; cb->args[1] = n; - if (need_locking) - genl_unlock(); - return skb->len; } |