Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next

1 files changed, 13 insertions, 3 deletions

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index e2e785c74630..f73704321a77 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -626,8 +626,13 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
 
                 chan->sec_level = sec.level;
 
+                if (!chan->conn)
+                        break;
+
                 conn = chan->conn;
-                if (conn && chan->scid == L2CAP_CID_LE_DATA) {
+
+                /*change security for LE channels */
+                if (chan->scid == L2CAP_CID_LE_DATA) {
                         if (!conn->hcon->out) {
                                 err = -EINVAL;
                                 break;
@@ -635,9 +640,14 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
 
                         if (smp_conn_security(conn, sec.level))
                                 break;
-
-                        err = 0;
                         sk->sk_state = BT_CONFIG;
+
+                /* or for ACL link, under defer_setup time */
+                } else if (sk->sk_state == BT_CONNECT2 &&
+                                        bt_sk(sk)->defer_setup) {
+                        err = l2cap_chan_check_security(chan);
+                } else {
+                        err = -EINVAL;
                 }
                 break;