---

yaml --- r: 232474 b: refs/heads/master c: d00ef24 h: refs/heads/master v: v3
git-mirror · Jan 19, 2011 · 497e464 · 497e464
1 parent 3a32de1
commit 497e464
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8556edd32f01c50a3c99e44dc2c3b1252ea59605
+refs/heads/master: d00ef24fc2923b65fdd440dc6445903e965841ac
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
@@ -1106,7 +1106,8 @@ static int l2cap_do_connect(struct sock *sk)
 		if (sk->sk_type != SOCK_SEQPACKET &&
 				sk->sk_type != SOCK_STREAM) {
 			l2cap_sock_clear_timer(sk);
-			sk->sk_state = BT_CONNECTED;
+			if (l2cap_check_security(sk))
+				sk->sk_state = BT_CONNECTED;
 		} else
 			l2cap_do_start(sk);
 	}