aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2010-06-14 01:26:15 -0400
committerMarcel Holtmann <marcel@holtmann.org>2010-07-21 13:39:09 -0400
commit8cb8e6f1684be13b51f8429b15f39c140326b327 (patch)
treeaee53be69e42ade43b8678079badada7dced3ec2
parentcf6c2c0b9f47ee3cd12684b905725c8376d52135 (diff)
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.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 6a33d269389e..f6e46fdddd2b 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
3052 if (!sk) 3052 if (!sk)
3053 return -ENOENT; 3053 return -ENOENT;
3054 3054
3055 if (sk->sk_state == BT_DISCONN) 3055 if (sk->sk_state != BT_CONFIG) {
3056 struct l2cap_cmd_rej rej;
3057
3058 rej.reason = cpu_to_le16(0x0002);
3059 l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ,
3060 sizeof(rej), &rej);
3056 goto unlock; 3061 goto unlock;
3062 }
3057 3063
3058 /* Reject if config buffer is too small. */ 3064 /* Reject if config buffer is too small. */
3059 len = cmd_len - sizeof(*req); 3065 len = cmd_len - sizeof(*req);