diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2016-04-05 17:10:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-07 16:44:14 -0400 |
| commit | 1e1d04e678cf72442f57ce82803c7a407769135f (patch) | |
| tree | 8ea1054b59c4abe211ffff0b81f34589b0089f22 /net/socket.c | |
| parent | 61881cfb5ad80c1d0a46ca6d08b7e271892b2ff6 (diff) | |
| download | linux-1e1d04e678cf72442f57ce82803c7a407769135f.tar.bz2 | |
net: introduce lockdep_is_held and update various places to use it
The socket is either locked if we hold the slock spin_lock for
lock_sock_fast and unlock_sock_fast or we own the lock (sk_lock.owned
!= 0). Check for this and at the same time improve that the current
thread/cpu is really holding the lock.
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 979d3146b081..afa3c3470717 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1046,7 +1046,7 @@ static int sock_fasync(int fd, struct file *filp, int on) return -EINVAL; lock_sock(sk); - wq = rcu_dereference_protected(sock->wq, sock_owned_by_user(sk)); + wq = rcu_dereference_protected(sock->wq, lockdep_sock_is_held(sk)); fasync_helper(fd, filp, on, &wq->fasync_list); if (!wq->fasync_list) |