diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-07 16:44:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-07 16:44:15 -0400 |
| commit | 1fbbe1a8a9b195c4ac856540dfaef49d663c2e91 (patch) | |
| tree | 24f93b5ab435e0bd4cada95b9f91df0a2e205186 /net/dccp/ipv4.c | |
| parent | 8501786929de4616b10b8059ad97abd304a7dddf (diff) | |
| parent | 8ced425ee630c03beea06c1dfa35190bf8395d07 (diff) | |
| download | op-kernel-dev-1fbbe1a8a9b195c4ac856540dfaef49d663c2e91.zip op-kernel-dev-1fbbe1a8a9b195c4ac856540dfaef49d663c2e91.tar.gz | |
Merge branch 'sock-lockdep-tightening'
Hannes Frederic Sowa says:
====================
sock: lockdep tightening
First patch is from Eric Dumazet and improves lockdep accuracy for
socket locks. After that, second patch introduces lockdep_sock_is_held
and uses it. Final patch reverts and reworks the lockdep fix from Daniel
in the filter code, as we now have tighter lockdep support.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv4.c')
| -rw-r--r-- | net/dccp/ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 6438c5a..f6d183f 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -62,7 +62,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) nexthop = daddr = usin->sin_addr.s_addr; inet_opt = rcu_dereference_protected(inet->inet_opt, - sock_owned_by_user(sk)); + lockdep_sock_is_held(sk)); if (inet_opt != NULL && inet_opt->opt.srr) { if (daddr == 0) return -EINVAL; |
