|
@@ -3078,6 +3078,14 @@ static inline int l2cap_connect_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hd
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
+ /* don't delete l2cap channel if sk is owned by user */
|
|
|
+ if (sock_owned_by_user(sk)) {
|
|
|
+ sk->sk_state = BT_DISCONN;
|
|
|
+ l2cap_sock_clear_timer(sk);
|
|
|
+ l2cap_sock_set_timer(sk, HZ / 5);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
l2cap_chan_del(sk, ECONNREFUSED);
|
|
|
break;
|
|
|
}
|
|
@@ -3283,6 +3291,15 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd
|
|
|
|
|
|
sk->sk_shutdown = SHUTDOWN_MASK;
|
|
|
|
|
|
+ /* don't delete l2cap channel if sk is owned by user */
|
|
|
+ if (sock_owned_by_user(sk)) {
|
|
|
+ sk->sk_state = BT_DISCONN;
|
|
|
+ l2cap_sock_clear_timer(sk);
|
|
|
+ l2cap_sock_set_timer(sk, HZ / 5);
|
|
|
+ bh_unlock_sock(sk);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
l2cap_chan_del(sk, ECONNRESET);
|
|
|
bh_unlock_sock(sk);
|
|
|
|
|
@@ -3305,6 +3322,15 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd
|
|
|
if (!sk)
|
|
|
return 0;
|
|
|
|
|
|
+ /* don't delete l2cap channel if sk is owned by user */
|
|
|
+ if (sock_owned_by_user(sk)) {
|
|
|
+ sk->sk_state = BT_DISCONN;
|
|
|
+ l2cap_sock_clear_timer(sk);
|
|
|
+ l2cap_sock_set_timer(sk, HZ / 5);
|
|
|
+ bh_unlock_sock(sk);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
l2cap_chan_del(sk, 0);
|
|
|
bh_unlock_sock(sk);
|
|
|
|