diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-05-06 01:11:53 -0500 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-05-06 01:11:53 -0500 |
commit | e8f84c44a0d78cb3413d69331bee6ce4d86b2e1d (patch) | |
tree | 0eb14b7e337b7b8dbc1bd97e11a13e1abc114b9a /net/core/sock.c | |
parent | e365c882ed38dbbe1a6ff4ed72414835390368a6 (diff) | |
parent | f512eefd5cde0ad21bd99bbfe4dc70b62805838e (diff) |
Merge tag 'v3.10.37' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.37-finallinux-lng-v3.10.xlinux-lng
This is the 3.10.37 stable release
Conflicts:
scripts/package/builddeb
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 3ba527074f7f..d743099250f4 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2309,10 +2309,13 @@ void release_sock(struct sock *sk) if (sk->sk_backlog.tail) __release_sock(sk); + /* Warning : release_cb() might need to release sk ownership, + * ie call sock_release_ownership(sk) before us. + */ if (sk->sk_prot->release_cb) sk->sk_prot->release_cb(sk); - sk->sk_lock.owned = 0; + sock_release_ownership(sk); if (waitqueue_active(&sk->sk_lock.wq)) wake_up(&sk->sk_lock.wq); spin_unlock_bh(&sk->sk_lock.slock); |