diff options
| author |   Marcin Kraglak <marcin.kraglak@tieto.com> | 2014-06-13 14:08:22 +0200 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-06-13 14:36:39 +0200 |
| commit | 92d1372e1a9fec00e146b74e8b9ad7a385b9b37f (patch) | |
| tree | d34004c003fa17d7d71d25d085dbb1968556328f /net/bluetooth | |
| parent | Bluetooth: Fix locking of hdev when calling into SMP code (diff) | |
| download | linux-dev-92d1372e1a9fec00e146b74e8b9ad7a385b9b37f.tar.xz linux-dev-92d1372e1a9fec00e146b74e8b9ad7a385b9b37f.zip | |
Bluetooth: Allow change security level on ATT_CID in slave role
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index ade3fb4c23bc..e1378693cc90 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -787,11 +787,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; |