summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2010-06-14 02:26:15 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2010-12-06 15:37:50 -0200
commitdf6bd743b6f06b066c1c3ba7f2853a6e8d61468c (patch)
tree8d55a69b4282f018c3639134eae3a9947ae6c253 /net/bluetooth
parent09f921f83faa49cdea25abfb98c439c01526b89d (diff)
downloadlinux-stable-df6bd743b6f06b066c1c3ba7f2853a6e8d61468c.tar.gz
linux-stable-df6bd743b6f06b066c1c3ba7f2853a6e8d61468c.tar.bz2
linux-stable-df6bd743b6f06b066c1c3ba7f2853a6e8d61468c.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>
Diffstat (limited to 'net/bluetooth')
-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 c12eccfdfe01..c791fcda7b2d 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
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);