Bluetooth: report the right security level in getsockopt

During a security level elevation we need to keep track of the current
security level of a connection until the new one is not confirmed.

Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index f6d8e13197d681d67b6cbf4041350a1fc5e73b70..f52d58e05d028eac5dd38ceda1b628c307addc01 100644 (file)
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -379,7 +379,10 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch
                }
 
                memset(&sec, 0, sizeof(sec));
-               sec.level = chan->sec_level;
+               if (chan->conn)
+                       sec.level = chan->conn->hcon->sec_level;
+               else
+                       sec.level = chan->sec_level;
 
                if (sk->sk_state == BT_CONNECTED)
                        sec.key_size = chan->conn->hcon->enc_key_size;