diff options
author | Fugang Duan <fugang.duan@nxp.com> | 2019-03-14 23:17:28 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2019-04-23 12:09:07 -0400 |
commit | bbb69b37be15e1cff74730b7fa5659e1ee705795 (patch) | |
tree | 79eadfd2d5d8e393add2a80b7b53b69e51c059cb /net | |
parent | ba8f5289f706aed94cc95b15cc5b89e22062f61f (diff) |
Bluetooth: Add return check for L2CAP security level set
Add return check for security level set 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.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index dcb14abebeba..a7be8b59b3c2 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c | |||
@@ -791,10 +791,13 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, | |||
791 | 791 | ||
792 | conn = chan->conn; | 792 | conn = chan->conn; |
793 | 793 | ||
794 | /*change security for LE channels */ | 794 | /* change security for LE channels */ |
795 | if (chan->scid == L2CAP_CID_ATT) { | 795 | if (chan->scid == L2CAP_CID_ATT) { |
796 | if (smp_conn_security(conn->hcon, sec.level)) | 796 | if (smp_conn_security(conn->hcon, sec.level)) { |
797 | err = -EINVAL; | ||
797 | break; | 798 | break; |
799 | } | ||
800 | |||
798 | set_bit(FLAG_PENDING_SECURITY, &chan->flags); | 801 | set_bit(FLAG_PENDING_SECURITY, &chan->flags); |
799 | sk->sk_state = BT_CONFIG; | 802 | sk->sk_state = BT_CONFIG; |
800 | chan->state = BT_CONFIG; | 803 | chan->state = BT_CONFIG; |