diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-04-01 08:52:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-04 22:11:19 -0400 |
| commit | 2d331915a04144dad738e725769d8fac06ef6155 (patch) | |
| tree | 5bf80c73627b0783603e8a46573db2cf50041280 /net/ipv4/inet_diag.c | |
| parent | ee3cf32a4a5e6cf5ccc0f0de9865fda3ebc46436 (diff) | |
| download | linux-2d331915a04144dad738e725769d8fac06ef6155.tar.bz2 | |
tcp/dccp: use rcu locking in inet_diag_find_one_icsk()
RX packet processing holds rcu_read_lock(), so we can remove
pairs of rcu_read_lock()/rcu_read_unlock() in lookup functions
if inet_diag also holds rcu before calling them.
This is needed anyway as __inet_lookup_listener() and
inet6_lookup_listener() will soon no longer increment
refcount on the found listener.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_diag.c')
| -rw-r--r-- | net/ipv4/inet_diag.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 5fdb02f5598e..ea8df527b279 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -356,6 +356,7 @@ struct sock *inet_diag_find_one_icsk(struct net *net, { struct sock *sk; + rcu_read_lock(); if (req->sdiag_family == AF_INET) sk = inet_lookup(net, hashinfo, NULL, 0, req->id.idiag_dst[0], req->id.idiag_dport, req->id.idiag_src[0], @@ -376,9 +377,11 @@ struct sock *inet_diag_find_one_icsk(struct net *net, req->id.idiag_if); } #endif - else + else { + rcu_read_unlock(); return ERR_PTR(-EINVAL); - + } + rcu_read_unlock(); if (!sk) return ERR_PTR(-ENOENT); |