aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2010-06-14 01:26:15 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2010-12-06 12:37:50 -0500
commitdf6bd743b6f06b066c1c3ba7f2853a6e8d61468c (patch)
tree8d55a69b4282f018c3639134eae3a9947ae6c253
parent09f921f83faa49cdea25abfb98c439c01526b89d (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 c12eccfdfe0..c791fcda7b2 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3124,8 +3124,14 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
3124 if (!sk) 3124 if (!sk)
3125 return -ENOENT; 3125 return -ENOENT;
3126 3126
3127 if (sk->sk_state == BT_DISCONN) 3127 if (sk->sk_state != BT_CONFIG) {
3128 struct l2cap_cmd_rej rej;
3129
3130 rej.reason = cpu_to_le16(0x0002);
3131 l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ,
3132 sizeof(rej), &rej);
3128 goto unlock; 3133 goto unlock;
3134 }
3129 3135
3130 /* Reject if config buffer is too small. */ 3136 /* Reject if config buffer is too small. */
3131 len = cmd_len - sizeof(*req); 3137 len = cmd_len - sizeof(*req);