summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFugang Duan <fugang.duan@nxp.com>2019-03-14 17:56:57 +0800
committerFugang Duan <fugang.duan@nxp.com>2019-03-18 14:25:20 +0800
commitd0e4a2f9ea46d49f2af10ea4aa5e47ee83043922 (patch)
tree2bd5f11cbf83753c39d79c76d1af086c4b790e86 /net
parent0ea3f1565de1765c29ea00d90ad01d1d00a7463b (diff)
bluetooth: l2cap: add security setting check
Add security setting check for socket interface since stack will check the return value. Signed-off-by: Fugang Duan <fugang.duan@nxp.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_sock.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 67a8642f57ea..a4189cb1661f 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -794,8 +794,11 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
/*change security for LE channels */
if (chan->scid == L2CAP_CID_ATT) {
- if (smp_conn_security(conn->hcon, sec.level))
+ if (smp_conn_security(conn->hcon, sec.level)) {
+ err = -EINVAL;
break;
+ }
+
set_bit(FLAG_PENDING_SECURITY, &chan->flags);
sk->sk_state = BT_CONFIG;
chan->state = BT_CONFIG;