| From 92d1372e1a9fec00e146b74e8b9ad7a385b9b37f Mon Sep 17 00:00:00 2001 |
| From: Marcin Kraglak <marcin.kraglak@tieto.com> |
| Date: Fri, 13 Jun 2014 14:08:22 +0200 |
| Subject: Bluetooth: Allow change security level on ATT_CID in slave role |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/bluetooth/l2cap_sock.c | 5 ----- |
| 1 file changed, 5 deletions(-) |
| |
| --- a/net/bluetooth/l2cap_sock.c |
| +++ b/net/bluetooth/l2cap_sock.c |
| @@ -778,11 +778,6 @@ static int l2cap_sock_setsockopt(struct |
| |
| /*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; |
