diff options
| author | Ying Xue | 2015-05-28 07:19:22 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-05-31 03:08:37 +0200 |
| commit | 1ea23a21176e449685a9d0523ab6da83e3779eb1 (patch) | |
| tree | 0e94b86cd5aff3b37351e0bb9ad203fa7d340bac /net/tipc/socket.c | |
| parent | if_vlan: fix vlaue -> value typo (diff) | |
| download | kernel-qcow2-linux-1ea23a21176e449685a9d0523ab6da83e3779eb1.tar.gz kernel-qcow2-linux-1ea23a21176e449685a9d0523ab6da83e3779eb1.tar.xz kernel-qcow2-linux-1ea23a21176e449685a9d0523ab6da83e3779eb1.zip | |
tipc: unconditionally put sock refcnt when sock timer to be deleted is pending
As sock refcnt is taken when sock timer is started in
sk_reset_timer(), the sock refcnt should be put when sock timer
to be deleted is in pending state no matter what "probing_state"
value of tipc sock is.
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 9370f953e16f..30ea82a9b0f1 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -410,7 +410,7 @@ static int tipc_release(struct socket *sock) struct net *net; struct tipc_sock *tsk; struct sk_buff *skb; - u32 dnode, probing_state; + u32 dnode; /* * Exit if socket isn't fully initialized (occurs when a failed accept() @@ -448,10 +448,7 @@ static int tipc_release(struct socket *sock) } tipc_sk_withdraw(tsk, 0, NULL); - probing_state = tsk->probing_state; - if (del_timer_sync(&sk->sk_timer) && - probing_state != TIPC_CONN_PROBING) - sock_put(sk); + sk_stop_timer(sk, &sk->sk_timer); tipc_sk_remove(tsk); if (tsk->connected) { skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, |