diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-06-14 02:26:15 -0300 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-07-21 10:39:09 -0700 |
commit | 8cb8e6f1684be13b51f8429b15f39c140326b327 (patch) | |
tree | aee53be69e42ade43b8678079badada7dced3ec2 | |
parent | cf6c2c0b9f47ee3cd12684b905725c8376d52135 (diff) | |
download | linux-3.10-8cb8e6f1684be13b51f8429b15f39c140326b327.tar.gz linux-3.10-8cb8e6f1684be13b51f8429b15f39c140326b327.tar.bz2 linux-3.10-8cb8e6f1684be13b51f8429b15f39c140326b327.zip |
Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state
If such event happens we shall reply with a Command Reject, because we are
not expecting any configure request.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r-- | net/bluetooth/l2cap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 6a33d269389..f6e46fdddd2 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -3052,8 +3052,14 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr if (!sk) return -ENOENT; - if (sk->sk_state == BT_DISCONN) + if (sk->sk_state != BT_CONFIG) { + struct l2cap_cmd_rej rej; + + rej.reason = cpu_to_le16(0x0002); + l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ, + sizeof(rej), &rej); goto unlock; + } /* Reject if config buffer is too small. */ len = cmd_len - sizeof(*req); |