| From | Kamal Mostafa <> | Subject | [PATCH 3.13 167/198] Bluetooth: Allow change security level on ATT_CID in slave role | Date | Tue, 15 Jul 2014 14:30:37 -0700 |
| |
3.13.11.5 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Marcin Kraglak <marcin.kraglak@tieto.com>
commit 92d1372e1a9fec00e146b74e8b9ad7a385b9b37f upstream.
Kernel supports SMP Security Request so don't block increasing security when we are slave.
Signed-off-by: Marcin Kraglak <marcin.kraglak@tieto.com> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- net/bluetooth/l2cap_sock.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 9c27684..c9e0915 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -691,11 +691,6 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, /*change security for LE channels */ if (chan->scid == L2CAP_CID_ATT) { - if (!conn->hcon->out) { - err = -EINVAL; - break; - } - if (smp_conn_security(conn->hcon, sec.level)) break; sk->sk_state = BT_CONFIG; -- 1.9.1
|