diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-20 10:06:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-20 10:06:19 -0700 |
| commit | f12d8c177c00695eb5c35d132eccd5ffcdaca922 (patch) | |
| tree | f6edbf8c8c994f49caca46c9c3ff71d7d098b90a | |
| parent | 497c6eb673d94487cfde35c7077981733fe862fb (diff) | |
| download | kernel_samsung_espresso10-f12d8c177c00695eb5c35d132eccd5ffcdaca922.zip kernel_samsung_espresso10-f12d8c177c00695eb5c35d132eccd5ffcdaca922.tar.gz kernel_samsung_espresso10-f12d8c177c00695eb5c35d132eccd5ffcdaca922.tar.bz2 | |
Revert "genetlink: fix family dump race"
This reverts commit bba2a9f0d381e510ba32f2f984e5ae1e705c90d1 which is
commit 58ad436fcf49810aa006016107f494c9ac9013db upstream, as there are
reported problems with it.
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 409dd40..874f8ff 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -700,10 +700,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; @@ -725,9 +721,6 @@ errout: cb->args[0] = i; cb->args[1] = n; - if (need_locking) - genl_unlock(); - return skb->len; } |